diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-17 13:38:36 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-17 13:42:24 +0100 |
| commit | 35701ddafd918b48205d0cd48a3ddacb1ffc3ccd (patch) | |
| tree | 09965c9ba62d8eb7417e6814f1fc2a64b1d94e84 /RepositoryFixes.mk | |
| parent | 8dc2c3e75ec617b4f55027c80c108694837b8078 (diff) | |
killing off stl in gbuild
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 7e1bae4ee916..4d26cccb6bba 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -38,8 +38,6 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES)) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) endif @@ -51,8 +49,6 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES)) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) endif @@ -92,8 +88,6 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES)) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) else gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) @@ -108,7 +102,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) gb_Library_NOILIBFILENAMES:=\ advapi32 \ gdi32 \ @@ -155,8 +148,6 @@ endif # we do not require a known rule for these, when using system libs -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) - ifeq ($(SYSTEM_LIBXML),YES) gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS)) endif |