diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-22 02:41:58 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-29 17:30:26 +0200 |
| commit | e9301742254b85f4c6fbfd9378b365c76f5ff367 (patch) | |
| tree | 1be461c1d4229562eb69134ca1f7964879e25c53 /configure.ac | |
| parent | 8196c0a0a532dc1b8577d1aa530c8f9f47fc3e61 (diff) | |
gbuild: implement gb_Library_get_target_for_build
I was wondering why removing instdir stuff forced a rebuild of
the cross toolset. Turned out some cross-toolset bits were wrongly
depending on host build stuff. It even had FIXME...
As a consequence, gb_CPPU_ENV was replaced by config_host.mk flags
to provide an CPPU_ENV_FOR_BUILD and also uses the correct
OS_FOR_BUILD.
Change-Id: I50e8e8dca50ab1ad3164948a585a792a52e4a39a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116359
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 4175aae4aa41..43fb8d877515 100644 --- a/configure.ac +++ b/configure.ac @@ -5210,6 +5210,20 @@ AC_SUBST(PLATFORMID) AC_SUBST(WINDOWS_X64) AC_DEFINE_UNQUOTED(WORKDIR,"$WORKDIR") +if test "$OS" = WNT -a "$COM" = MSC; then + case "$CPUNAME" in + INTEL) CPPU_ENV=msci ;; + X86_64) CPPU_ENV=mscx ;; + AARCH64) CPPU_ENV=msca ;; + *) + AC_MSG_ERROR([Unknown \$CPUNAME '$CPUNAME' for $OS / $COM"]) + ;; + esac +else + CPPU_ENV=gcc3 +fi +AC_SUBST(CPPU_ENV) + dnl =================================================================== dnl Test which package format to use dnl =================================================================== @@ -5410,6 +5424,7 @@ if test "$cross_compiling" = "yes"; then # all these will get a _FOR_BUILD postfix DIRECT_FOR_BUILD_SETTINGS=" CC + CPPU_ENV CXX ILIB JAVA_HOME @@ -5495,6 +5510,7 @@ if test "$cross_compiling" = "yes"; then else OS_FOR_BUILD="$OS" CC_FOR_BUILD="$CC" + CPPU_ENV_FOR_BUILD="$CPPU_ENV" CXX_FOR_BUILD="$CXX" INSTDIR_FOR_BUILD="$INSTDIR" INSTROOT_FOR_BUILD="$INSTROOT" @@ -5516,6 +5532,7 @@ AC_SUBST(SDKDIRNAME_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) AC_SUBST(CC_FOR_BUILD) AC_SUBST(CXX_FOR_BUILD) +AC_SUBST(CPPU_ENV_FOR_BUILD) dnl =================================================================== dnl Check for syslog header |