diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 19:59:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 00:54:43 +0300 |
| commit | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch) | |
| tree | eac7091c6fa969ed652f8ae23d775b13a30b2b66 /RepositoryExternal.mk | |
| parent | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (diff) | |
Try to fix cross-compilation
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4db3dd15827e..b036b667b0b7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2911,7 +2911,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -2944,7 +2944,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ )) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ $(call gb_UnoApi_get_target,offapi) \ $(call gb_UnoApi_get_target,udkapi) \ ) @@ -2986,7 +2986,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_target_for_build,saxparser) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -3000,7 +3000,7 @@ $(call gb_Executable_add_runtime_dependencies,uno,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_target_for_build,ure/services) \ - $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ + $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -3050,7 +3050,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_ else -$(call gb_ExternalExecutable_set_internal,python,$(gb_INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) +$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) $(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) |