[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/bin

[Michael Stahl]

 config_host.mk.in                         |    2 +-
 configure.ac                              |    8 ++++----
 solenv/bin/macosx-change-install-names.pl |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4956d0667d1e399007e088a0ea2079c20482e567
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 13 17:37:34 2013 +0200

    configure: ensure that install_name_tool matches the toolchain...
    
    ... used to build, since otherwise it'll break with "malformed object"
    errors.  Alo replace now unused XCRUN variable.
    
    Change-Id: I58a20c34f903b7a7acb46597d94243389e6b3842

diff --git a/config_host.mk.in b/config_host.mk.in
index f391bdd..cfd1357 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -262,6 +262,7 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTDIR=@INSTDIR@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
+export INSTALL_NAME_TOOL=@INSTALL_NAME_TOOL@
 export JAVACISGCJ=@JAVACISGCJ@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
@@ -601,7 +602,6 @@ export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
 export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
-export XCRUN=@XCRUN@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 0d4fccc..4c3def0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2698,11 +2698,11 @@ if test $_os = Darwin; then
             if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = "/Applications/Xcode.app"; then
                 CC="`xcrun -find gcc` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
                 CXX="`xcrun -find g++` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
-                XCRUN=xcrun
             else
                 CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
                 CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
             fi
+            INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
             LIBTOOL=libtool
             ;;
         10.7|10.8|10.9)
@@ -2719,7 +2719,7 @@ if test $_os = Darwin; then
             fi
             CC="`xcrun -find clang` $bitness $lto -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
             CXX="`xcrun -find clang++` $bitness $lto $stdlib -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
-            XCRUN=xcrun
+            INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
             AR=`xcrun -find ar`
             LIBTOOL=`xcrun -find libtool`
             RANLIB=`xcrun -find ranlib`
@@ -2820,7 +2820,7 @@ AC_SUBST(MACOSX_SDK_VERSION)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
 AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
-AC_SUBST(XCRUN)
+AC_SUBST(INSTALL_NAME_TOOL)
 AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU libtool
 AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)
@@ -2866,7 +2866,7 @@ if test $_os = iOS; then
     fi
     CC="`xcrun -find clang` -arch $arch -isysroot $sysroot $lto $versionmin"
     CXX="`xcrun -find clang++` -arch $arch -isysroot $sysroot $lto $versionmin"
-    XCRUN=xcrun
+    INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
     AR=`xcrun -find ar`
     LIBTOOL=`xcrun -find libtool`
     RANLIB=`xcrun -find ranlib`
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index cbfd06f..6d7edb2 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -90,7 +90,7 @@ foreach $file (@ARGV)
     close(IN) or die "got $? from $call";
     if ($change ne "")
     {
-        $call = "$ENV{'XCRUN'} install_name_tool$change $file";
+        $call = "$ENV{'INSTALL_NAME_TOOL'} $change $file";
         system($call) == 0 or die "cannot $call";
     }
 }