diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-17 01:14:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-17 18:16:10 +0300 |
| commit | cb87239694e17e014c345a231c0eb21cb121f6c2 (patch) | |
| tree | e6379771ef41036af9f4e9b28d483c5083b65993 /configure.ac | |
| parent | Massage ifdefs etc for iOS to avoid undefineds (diff) | |
| download | core-cb87239694e17e014c345a231c0eb21cb121f6c2.tar.gz core-cb87239694e17e014c345a231c0eb21cb121f6c2.zip | |
Use correct path to the build platform's services.rdb when cross-compiling
Requires introducing LIBO_URE_MISC_FOLDER_FOR_BUILD.
Change-Id: I133a7f73e48090f67764838b45de4fe8b7580efe
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
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) |