strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use $(OS_FOR_BUILD) to fix mingw cross-compilation

Browse source 
Change-Id: I606e99e80ace5b086210e5a724a3e979e2b98cbf
This commit is contained in:
David Tardon 2013-05-16 14:38:39 +02:00
parent 5970aad9c6
commit a494a8329f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RepositoryExternal.mk
View file

@ -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) \

2
solenv/gbuild/Gallery.mk
View file

@ -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 \

2
solenv/gbuild/extensions/pre_BuildTools.mk
View file

@ -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