diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-01-18 23:08:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-18 23:09:00 +0000 |
| commit | d5d8320ba1fba493e0e091fd46207ea7a34cc9e7 (patch) | |
| tree | d19aa55f1f28f5e82526e9212b818309852ffb8f /configure.ac | |
| parent | a28fc0ea2f533076f8573f07f9fa0ca7d6b7475a (diff) | |
Revert "don't pollute cross-compilation environment with host pig-config"
Caused tinderbox breakage.
This reverts commit af6a39120f590a49088d58c14d46f206abe3e4c2.
Change-Id: If07d3bda667001b479f41b2319bfef2e15068072
Reviewed-on: https://gerrit.libreoffice.org/21593
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index daeb3ccb0f4c..7bdea6f7333b 100644 --- a/configure.ac +++ b/configure.ac @@ -490,7 +490,6 @@ if test -n "$with_android_ndk"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections" ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}" - export PKG_CONFIG_LIBDIR="$ANDROID_BINUTILS_PREBUILT_ROOT/lib/pkgconfig" if test -n "$ANDROID_USING_CLANG"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -Qunused-arguments" @@ -4627,7 +4626,7 @@ if test "$cross_compiling" = "yes"; then unset CC CXX SYSBASE CFLAGS unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP unset CPPUNIT_CFLAGS CPPUNIT_LIBS - unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC PKG_CONFIG_LIBDIR + unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD" test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD" test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD" |