diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-17 14:30:51 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-17 19:34:32 +0200 |
| commit | 3259ec8fb318f484ca2bcd798df95fd28dea74f6 (patch) | |
| tree | 3ee6bd6d0dbaff93d6c347e2a17183c6fa120dd8 /solenv | |
| parent | f60cc89ec35f8b1bf56e9f69ef15143fd002c409 (diff) | |
Make spsupp_x64 independent of shell/CustomTarget_x64
... in preparation for further changes.
Thanks to Noel Grandin for the hint!
Change-Id: I2b223322d1d42099b56a74a92e3c39631d6b581c
Reviewed-on: https://gerrit.libreoffice.org/72470
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 5eed2a4edb1c..7351d070b35c 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1410,7 +1410,6 @@ endef # call gb_LinkTarget_add_x64_generated_cobjects,linktarget,sourcefiles,cflags,linktargetmakefilename define gb_LinkTarget_add_x64_generated_cobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3),$(4))) -$(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : CXXOBJECT_X64 := YES)) endef # call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,cxxflags,linktargetmakefilename diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 5904579a3e2b..5a02ea57eeac 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -39,7 +39,7 @@ define gb_CObject__command_pattern $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ unset INCLUDE && \ - $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), \ + $(if $(filter YES,$(LIBRARY_X64)), $(CXX_X64_BINARY), \ $(if $(filter YES,$(PE_X86)), $(CXX_X86_BINARY), \ $(if $(filter %.c,$(3)), $(gb_CC), \ $(if $(filter -clr,$(2)), \ @@ -57,7 +57,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \ $(INCLUDE) \ - $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ + $(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \ $(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,) \ -c $(3) \ -Fo$(1)) $(if $(filter $(true),$(6)),/link /DEBUG:FASTLINK) \ |