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 /config_host.mk.in | |
| 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 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index b7e3e0930b3f..567c8b1e1c31 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -260,10 +260,13 @@ export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@ export ILIB=@ILIB@ export INPATH=@INPATH@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ -export INSTDIR=@INSTDIR@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ export INSTALL_NAME_TOOL=@INSTALL_NAME_TOOL@ +export INSTDIR=@INSTDIR@ +export INSTDIR_FOR_BUILD=@INSTDIR_FOR_BUILD@ +export INSTROOT=@INSTROOT@ +export INSTROOT_FOR_BUILD=@INSTROOT_FOR_BUILD@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ @@ -307,8 +310,10 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLOADER_JAR=@LIBLOADER_JAR@ export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@ +export LIBO_BIN_FOLDER_FOR_BUILD=@LIBO_BIN_FOLDER_FOR_BUILD@ export LIBO_ETC_FOLDER=@LIBO_ETC_FOLDER@ export LIBO_LIB_FOLDER=@LIBO_LIB_FOLDER@ +export LIBO_LIB_FOLDER_FOR_BUILD=@LIBO_LIB_FOLDER_FOR_BUILD@ export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@ export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@ export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@ @@ -317,6 +322,7 @@ export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@ export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@ export LIBO_URE_BIN_FOLDER=@LIBO_URE_BIN_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_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@ export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ |