diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 09:54:22 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 09:55:27 +0100 |
| commit | 88880514d2f2b1c1fdc199591d9e2b2ce259964f (patch) | |
| tree | 0c40b51ae0f97818a7337a98c8e6c42672ce4cc2 /Module_tail_build.mk | |
| parent | 065596f57690f7dda6dcd00ba7871a335d49c458 (diff) | |
serialize more linking, and handle the pathological mergelibs case
Change-Id: I0c4b1e4d7d5e4802dbea0a1c5a9ec80874f7ed21
Diffstat (limited to 'Module_tail_build.mk')
| -rw-r--r-- | Module_tail_build.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 533dd2485154..a6d58a49b185 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -164,6 +164,12 @@ $(if $(strip $(1)),\ $(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1)))) endef -$(eval $(call tailbuild_serialize,scfilt sc sw sd $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) oox svxcore vcl xo)) +$(eval $(call tailbuild_serialize,\ + scfilt sc sw sd \ + $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ + oox vcl xo writerfilter cui chartcontroller swui \ + vbaobj msword \ +)) # vim: set noet sw=4 ts=4: |