|
Line
Link Here
|
| 0 |
-- STLport-5.1.5.orig/build/Makefiles/gmake/lib/gcc.mak |
0 |
++ STLport-5.1.5/build/Makefiles/gmake/lib/gcc.mak |
|
Lines 89-97
Link Here
|
| 89 |
# Include whole language support archive (libsupc++.a) into libstlport: |
89 |
# Include whole language support archive (libsupc++.a) into libstlport: |
| 90 |
# all C++ issues are in libstlport now. |
90 |
# all C++ issues are in libstlport now. |
| 91 |
ifeq ($(OSNAME),linux) |
91 |
ifeq ($(OSNAME),linux) |
| 92 |
START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
92 |
START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
| 93 |
#START_A_OBJ := $(shell for o in crt{i,beginT}.o; do ${CXX} -print-file-name=$$o; done) |
93 |
#START_A_OBJ := $(shell for o in crt{i,beginT}.o; do ${CXX} -print-file-name=$$o; done) |
| 94 |
END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
94 |
END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
| 95 |
STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm |
95 |
STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm |
| 96 |
endif |
96 |
endif |
| 97 |
ifeq ($(OSNAME),openbsd) |
97 |
ifeq ($(OSNAME),openbsd) |
|
Lines 107-114
Link Here
|
| 107 |
STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -l${PTHR} -lc -lm |
107 |
STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -l${PTHR} -lc -lm |
| 108 |
endif |
108 |
endif |
| 109 |
ifeq ($(OSNAME),netbsd) |
109 |
ifeq ($(OSNAME),netbsd) |
| 110 |
START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
110 |
START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
| 111 |
END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
111 |
END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
| 112 |
STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm |
112 |
STDLIBS := -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm |
| 113 |
endif |
113 |
endif |
| 114 |
ifeq ($(OSNAME),sunos) |
114 |
ifeq ($(OSNAME),sunos) |
| 115 |
-- STLport-5.1.5.orig/build/Makefiles/gmake/app/gcc.mak |
115 |
++ STLport-5.1.5/build/Makefiles/gmake/app/gcc.mak |
|
Lines 104-111
Link Here
|
| 104 |
endif |
104 |
endif |
| 105 |
|
105 |
|
| 106 |
ifeq ($(OSNAME),linux) |
106 |
ifeq ($(OSNAME),linux) |
| 107 |
START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
107 |
START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
| 108 |
END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
108 |
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done) |
| 109 |
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm |
109 |
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm |
| 110 |
endif |
110 |
endif |
| 111 |
ifeq ($(OSNAME),openbsd) |
111 |
ifeq ($(OSNAME),openbsd) |
