diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-13 20:17:07 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-13 20:18:21 -0400 |
| commit | a28a70cdd6a3a28f902f153f725da3bae042c181 (patch) | |
| tree | e5b259f89355209fef468799d226a26694930c22 /solenv | |
| parent | ffe09728cb829016dbbe24ffc5ed10cfc15cfd5c (diff) | |
make mergelibs=all not crash
Change-Id: Ie9a7b6c293a16ebf8773b7868de61ea5601000da
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index edc728c8dea7..b0cb22fb8851 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -41,9 +41,7 @@ gb_EXTRAMERGEDLIBS := \ oox \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ - sc \ sd \ - sw \ swd \ test \ unotest \ @@ -52,52 +50,9 @@ gb_EXTRAMERGEDLIBS := \ # FIXME: just retaining these for now - they currently crash & need thought. #gb_EXTRAMERGEDLIBS := \ - analysis \ - $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ - ctl \ - cui \ - date \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ - embobj \ - evtatt \ - fastsax \ - $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ - $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ - fwm \ - hwp \ - hyphen \ - $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),juh) \ - $(if $(filter-out IOS,$(OS)),jvmaccess) \ - jvmfwk \ - lnth \ - localedata_en \ - localedata_es \ - localedata_euro \ - localedata_others \ - $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ - pricing \ - $(call gb_Helper_optional,PYUNO,pythonloader) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ - $(if $(DISABLE_SCRIPTING),,scriptframe) \ - scui \ - scfilt \ - sdui \ - $(if $(filter-out IOS,$(OS)),solver) \ - spell \ - $(if $(DISABLE_SCRIPTING),,stringresource) \ - subsequenttest \ - swui \ - textfd \ - ucpcmis1 \ - $(if $(filter-out IOS,$(OS)),wpftdraw) \ - $(if $(filter-out IOS,$(OS)),wpftwriter) \ - writerfilter \ - xmlfa \ - xmlfd \ + sc \ + sw \ + # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ @@ -159,7 +114,7 @@ gb_URELIBS := \ salhelper \ store \ unoidl \ - xmlreader \ + xmlreader endif |