diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-14 12:40:24 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-14 15:46:22 +0200 |
| commit | cc459ea8c1d2d398c0bad5e52591af93ebc4db38 (patch) | |
| tree | 7dbb205232ea69f3908aeba5ca5407a15250260e /solenv | |
| parent | fdo#45748: Don't use empty pages fo computing the page break position (diff) | |
| download | core-cc459ea8c1d2d398c0bad5e52591af93ebc4db38.tar.gz core-cc459ea8c1d2d398c0bad5e52591af93ebc4db38.zip | |
Skip merged libraries
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index d542017b4092..0fff77fce6e2 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -467,8 +467,9 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.dll,%.ilk,$(3)) \ ) +$(if $(filter $(gb_MERGEDLIBS),$(1)),,\ $(call gb_Library_get_target,$(1)) \ -$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) +$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))) ifneq ($(ENABLE_CRASHDUMP),) $(call gb_Library_get_target,$(1)) \ @@ -480,7 +481,7 @@ endif $(call gb_Library_add_default_nativeres,$(1),$(1)/default) -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) +$(if $(filter $(gb_MERGEDLIBS),$(1)),,$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))) $(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) |