diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-15 14:56:34 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-16 13:25:38 +0200 |
| commit | 40a4c469dff783736ba69ec4134e3c23e78b2769 (patch) | |
| tree | bd7d27fd611a9fd076965226af8636d524a4d8ee | |
| parent | 2969b1007ae3df1e70c5fa18fab1b41fff6da210 (diff) | |
fdo#55290 do not use resource file for assembly libs
I am not sure this really fixes the problem, but it is the only
difference between dmake and gbuild builds I can see.
Change-Id: I96fa4120dc2a8221a75e150a62582aebda98f505
| -rw-r--r-- | cli_ure/Library_cli_cppuhelper_native.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 5582e770b91e..32b9ffd99a9d 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,cli_cppuhelper_native)) +$(eval $(call gb_Library_Assembly,cli_cppuhelper_native)) # When compiling for CLR, disable "warning C4339: use of undefined type detected # in CLR meta-data - use of this type may lead to a runtime exception": diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 151327eb0d5b..180cb69fc80e 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -449,6 +449,13 @@ gb_Library_DLLFILENAMES :=\ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ +# An assembly is a special kind of library for CLI +define gb_Library_Assembly +$(call gb_Library_Library,$(1)) +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : NATIVERES := + +endef + define gb_Library_Library_platform $(call gb_LinkTarget_set_dlltarget,$(2),$(3)) |