diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-16 14:38:39 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-16 14:39:25 +0200 |
| commit | a494a8329f211a37ff2d5b8fe28bbc8a0a3beb66 (patch) | |
| tree | b3014a3804645676bd4ebe34d7e65783c860b009 | |
| parent | 5970aad9c63e541071594242037a815da652ca3c (diff) | |
use $(OS_FOR_BUILD) to fix mingw cross-compilation
Change-Id: I606e99e80ace5b086210e5a724a3e979e2b98cbf
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d80a22a29050..2762e4cc6f05 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2898,7 +2898,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal.bin,\ $(call gb_Configuration_get_target,registry) \ $(call gb_Configuration_get_target,fcfg_langpack) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(if $(filter-out MACOSX WNT,$(OS)), \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \ $(call gb_Library_get_target,vclplug_svp) \ ) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index a866a116f8e4..bf7d72ca91de 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1) $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_Gallery_get_workdir,$(2))/* && \ $(call gb_Helper_print_on_error,\ - $(if $(filter-out MACOSX WNT,$(OS)),SAL_USE_VCLPLUGIN=svp) \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \ $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \ $(call gb_Gallery__make_env_args) \ --build-tree \ diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 39dd1f5e9b97..b48f2c4c9960 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -8,7 +8,7 @@ # -ifeq (,$(filter WNT,$(OS))) +ifeq (,$(filter WNT,$(OS_FOR_BUILD))) gb_GENGAL = gengal.bin else # windows appends the .exe gb_GENGAL = gengal |