diff options
Diffstat (limited to 'sal')
-rw-r--r-- | sal/cppunittester/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/condition/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/file/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/module/makefile.mk | 7 | ||||
-rwxr-xr-x | sal/qa/osl/mutex/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/profile/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/thread/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/rtl/digest/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/rtl/random/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/rtl/strings/makefile.mk | 7 | ||||
-rw-r--r-- | sal/util/makefile.mk | 14 |
11 files changed, 0 insertions, 84 deletions
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk index 61fe7868c9f3..938b63d90ae9 100644 --- a/sal/cppunittester/makefile.mk +++ b/sal/cppunittester/makefile.mk @@ -33,13 +33,6 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) OBJFILES = $(APP1OBJS) diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index ff922e069996..99c9b5dff2c4 100644 --- a/sal/qa/osl/condition/makefile.mk +++ b/sal/qa/osl/condition/makefile.mk @@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index c07e75486a80..8b6b1ff62d32 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index 6e181cb72724..3432f1865ac4 100644 --- a/sal/qa/osl/module/makefile.mk +++ b/sal/qa/osl/module/makefile.mk @@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk index 0e7ae05d0817..2ffe425afa79 100755 --- a/sal/qa/osl/mutex/makefile.mk +++ b/sal/qa/osl/mutex/makefile.mk @@ -40,13 +40,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk index 70e5f2abf710..8379783e19f6 100644 --- a/sal/qa/osl/profile/makefile.mk +++ b/sal/qa/osl/profile/makefile.mk @@ -41,13 +41,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk index 8b5ad83e0753..73ca4ec69a7e 100644 --- a/sal/qa/osl/thread/makefile.mk +++ b/sal/qa/osl/thread/makefile.mk @@ -33,13 +33,6 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -# building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk index feb76ffe2d40..c084b5ce12b8 100644 --- a/sal/qa/rtl/digest/makefile.mk +++ b/sal/qa/rtl/digest/makefile.mk @@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk index cb79ff90a770..c82ae0a6c18e 100644 --- a/sal/qa/rtl/random/makefile.mk +++ b/sal/qa/rtl/random/makefile.mk @@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk index 1ba3380669c6..d167c470df3d 100644 --- a/sal/qa/rtl/strings/makefile.mk +++ b/sal/qa/rtl/strings/makefile.mk @@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 4e1086823f1f..42c90ca04661 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -121,20 +121,6 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract SHL1STDLIBS=pthread.lib .ENDIF # OS2 -# If we compile sal with STLport checking iterators -# we need to link against the STLport -.IF "$(USE_STLP_DEBUG)" != "" -SHL1STDLIBS+=$(LIBSTLPORT) -.ENDIF - -#The irony that using the system STL instead of -#stlport requires that we link libsal with the -#LIBSTLPORT alias which is not required when using -#stlport is not lost on me -.IF "$(USE_SYSTEM_STL)"=="YES" -SHL1STDLIBS+=$(LIBSTLPORT) -.ENDIF - .IF "$(OS)"=="MACOSX" SHL1STDLIBS+=-framework CoreFoundation -framework Carbon .ENDIF |