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 /smoketest | |
| 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 'smoketest')
| -rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 2 | ||||
| -rw-r--r-- | smoketest/Executable_libtest.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 1bc9dae2952b..5909c309467c 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ $(eval $(call gb_CppunitTest_use_ure,smoketest)) ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE) -userinstallation=$(shell $(gb_DEVINSTALLROOT)/MacOS/soffice --nstemporarydirectory) +userinstallation=$(shell $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice --nstemporarydirectory) else userinstallation=$(WORKDIR)/CustomTarget/smoketest endif diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index f8bfcaff000a..dfab98dfa0e6 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Executable_add_exception_objects,libtest,\ smoketest/libtest \ )) -liblibreoffice_OWN_LD_PATH_DIR := $(gb_DEVINSTALLROOT)/program/libolib +liblibreoffice_OWN_LD_PATH_DIR := $(INSTROOT)/program/libolib liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library__get_workdir_linktargetname,libreoffice) $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice) @@ -37,6 +37,6 @@ $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice) run_libtest: $(liblibreoffice_OWN_LD_SO) $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library" \ $(WORKDIR)/LinkTarget/Executable/libtest \ - $(gb_DEVINSTALLROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \ + $(INSTROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \ # vim: set noet sw=4 ts=4: |