summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-08-17 01:14:54 +0300
committerTor Lillqvist <tml@collabora.com>2016-08-17 18:16:10 +0300
commitcb87239694e17e014c345a231c0eb21cb121f6c2 (patch)
treee6379771ef41036af9f4e9b28d483c5083b65993
parentfb83fd9d22e07f8a12e5f54eea60440123125717 (diff)
Use correct path to the build platform's services.rdb when cross-compiling
Requires introducing LIBO_URE_MISC_FOLDER_FOR_BUILD. Change-Id: I133a7f73e48090f67764838b45de4fe8b7580efe
-rw-r--r--RepositoryExternal.mk2
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac6
3 files changed, 6 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0345edcbc981..66208c26b90e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3852,7 +3852,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
$(call gb_Rdb_get_target_for_build,saxparser) \
- $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
)
endef
diff --git a/config_host.mk.in b/config_host.mk.in
index 7314216bd5b7..f85bf53ceabc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -349,6 +349,7 @@ export LIBO_URE_ETC_FOLDER=@LIBO_URE_ETC_FOLDER@
export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
export LIBO_URE_LIB_FOLDER_FOR_BUILD=@LIBO_URE_LIB_FOLDER_FOR_BUILD@
export LIBO_URE_MISC_FOLDER=@LIBO_URE_MISC_FOLDER@
+export LIBO_URE_MISC_FOLDER_FOR_BUILD=@LIBO_URE_MISC_FOLDER_FOR_BUILD@
export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
diff --git a/configure.ac b/configure.ac
index cda59370037f..4263324c974f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4748,9 +4748,9 @@ if test "$cross_compiling" = "yes"; then
mv config.log ../config.Build.log
mkdir -p ../config_build
mv config_host/*.h ../config_build
- . ./bin/get_config_variables CC CXX INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS PATH SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT WORKDIR
+ . ./bin/get_config_variables CC CXX INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER LIBO_URE_MISC_FOLDER OS PATH SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT WORKDIR
- for V in CC CXX LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT; do
+ for V in CC CXX LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER LIBO_URE_MISC_FOLDER OS SDKDIRNAME SYSTEM_LIBXML SYSTEM_LIBXSLT; do
VV='$'$V
VV=`eval "echo $VV"`
if test -n "$VV"; then
@@ -4792,6 +4792,7 @@ else
LIBO_BIN_FOLDER_FOR_BUILD="$LIBO_BIN_FOLDER"
LIBO_LIB_FOLDER_FOR_BUILD="$LIBO_LIB_FOLDER"
LIBO_URE_LIB_FOLDER_FOR_BUILD="$LIBO_URE_LIB_FOLDER"
+ LIBO_URE_MISC_FOLDER_FOR_BUILD="$LIBO_URE_MISC_FOLDER"
SDKDIRNAME_FOR_BUILD="$SDKDIRNAME"
WORKDIR_FOR_BUILD="$WORKDIR"
fi
@@ -4801,6 +4802,7 @@ AC_SUBST(INSTROOT_FOR_BUILD)
AC_SUBST(LIBO_BIN_FOLDER_FOR_BUILD)
AC_SUBST(LIBO_LIB_FOLDER_FOR_BUILD)
AC_SUBST(LIBO_URE_LIB_FOLDER_FOR_BUILD)
+AC_SUBST(LIBO_URE_MISC_FOLDER_FOR_BUILD)
AC_SUBST(SDKDIRNAME_FOR_BUILD)
AC_SUBST(WORKDIR_FOR_BUILD)