diff options
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index dcfa05337843..d5ddcd8925ce 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -197,6 +197,8 @@ $(eval $(call gb_Helper_collect_knownlibs)) gb_Library_DLLPOSTFIX := lo gb_RUN_CONFIGURE := +gb_CONFIGURE_PLATFORMS := --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) + # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index f4bb632d35a2..57f906ad1c53 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -53,4 +53,8 @@ gb_MSBUILD_CONFIG_AND_PLATFORM := \ /p:Configuration=$(gb_MSBUILD_CONFIG) \ /p:Platform=$(gb_MSBUILD_PLATFORM) +gb_CONFIGURE_PLATFORMS := \ + $(if $(and $(filter i686-pc-cygwin,$(HOST_PLATFORM)),$(filter x86_64-pc-cygwin,$(BUILD_PLATFORM))), \ + --build=$(HOST_PLATFORM),--build=$(BUILD_PLATFORM)) --host=$(HOST_PLATFORM) + # vim:set noexpandtab: |