diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | mysqlc/source/makefile.mk | 6 | ||||
| -rw-r--r-- | odk/settings/settings.mk | 4 | ||||
| -rw-r--r-- | python/makefile.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 0e5faf5e0334..9e5d354a61cd 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -696,6 +696,7 @@ export WPG_TARBALL=@WPG_TARBALL@ export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@ export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@ export WPS_TARBALL=@WPS_TARBALL@ +export XCRUN=@XCRUN@ export XINERAMA_LINK=@XINERAMA_LINK@ export XMLLINT=@XMLLINT@ export XPDF_TARBALL=@XPDF_TARBALL@ diff --git a/configure.ac b/configure.ac index b9ac3018b23f..42d6a20b59d8 100644 --- a/configure.ac +++ b/configure.ac @@ -2760,6 +2760,7 @@ if test "$_os" = "Darwin"; then 10.7|10.8) CC="`xcrun -find clang` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" CXX="`xcrun -find clang++` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" + XCRUN=xcrun ;; esac AC_MSG_RESULT([$CC and $CXX]) @@ -2808,6 +2809,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) dnl =================================================================== dnl Windows specific tests and stuff diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 92707702421d..5fecb22b36e9 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -251,7 +251,7 @@ $(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE) @@-$(MKDIRHIER) $(@:d) @$(COPY) $< $@ > $(NULLDEV) .IF "$(OS)" == "MACOSX" - install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@ + $(XCRUN) install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@ .ENDIF .ENDIF @@ -261,7 +261,7 @@ $(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE) @@-$(MKDIRHIER) $(@:d) @$(COPY) $< $@ > $(NULLDEV) .IF "$(OS)" == "MACOSX" - install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $@ + $(XCRUN) install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $@ .ENDIF .ENDIF @@ -269,5 +269,5 @@ $(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE) $(EXTENSION_TARGET): adjust_libmysql_path adjust_libmysql_path: $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) - install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) + $(XCRUN) install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) .ENDIF diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 3d4d98086d59..ed7aff6d7edd 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -459,9 +459,9 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________________________________________________ REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib' STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib' -INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3 +INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3 -INSTALL_NAME_URELIBS_BIN=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 +INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 EMPTYSTRING= PATH_SEPARATOR=: diff --git a/python/makefile.mk b/python/makefile.mk index 87014cacd742..18fa91b82be7 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -256,7 +256,7 @@ cd \"$$origpath\"\n\ $(PACKAGE_DIR)/fixinstallnames: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) @echo remove build installdir from OOoPython - $(COMMAND_ECHO)install_name_tool -change \ + $(COMMAND_ECHO)$(XCRUN) install_name_tool -change \ /$(my_prefix)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython \ @executable_path/../../../../OOoPython \ $(MYCWD)/$(my_prefix)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/Resources/Python.app/Contents/MacOS/OOoPython diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 82380e1a02d6..ed60cc2030e9 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -101,7 +101,7 @@ foreach $file (@ARGV) close(IN); if ($change ne "") { - $call = "install_name_tool$change $file"; + $call = "$ENV{'XCRUN'} install_name_tool$change $file"; system($call) == 0 or die "cannot $call"; } } |