]>
Commit | Line | Data |
---|---|---|
31dce10b | 1 | --- STLport-4.5.3/src/gcc-linux.mak.extra-cxxflags 2002-01-18 23:06:52.000000000 +0100 |
2 | +++ STLport-4.5.3/src/gcc-linux.mak 2002-08-20 10:38:56.000000000 +0200 | |
3 | @@ -2,7 +2,7 @@ | |
4 | # compiler | |
5 | # | |
6 | CC = gcc | |
7 | -CXX = c++ -pthread -fexceptions | |
8 | +CXX = g++ | |
9 | ||
10 | # | |
11 | # Basename for libraries | |
12 | @@ -14,7 +14,7 @@ LIB_BASENAME = libstlport_gcc | |
13 | # | |
14 | # | |
15 | LINK=ar crv | |
16 | -DYN_LINK=gcc -shared -o | |
17 | +DYN_LINK=$(CXX) -lpthread -shared -o | |
18 | ||
19 | OBJEXT=o | |
20 | DYNEXT=so | |
21 | @@ -38,10 +38,10 @@ WARNING_FLAGS= -W -Wno-sign-compare -Wno | |
22 | ||
23 | # boris : real locale implementation may not really work | |
bce180c2 JB |
24 | -CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_REAL_LOCALE_IMPLEMENTED -D_GNU_SOURCE |
25 | -# CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} | |
26 | +CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_REAL_LOCALE_IMPLEMENTED -D_GNU_SOURCE -pthread | |
27 | +# CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -pthread | |
31dce10b | 28 | |
29 | -CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 | |
30 | -CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC | |
31 | +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 $(EXTRA_CXXFLAGS) | |
32 | +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 $(EXTRA_CXXFLAGS) -fPIC | |
33 | ||
34 | CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g | |
35 | CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC |