Skip to content

C
core
Kaydet (Commit) f5bdeec9 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Use xcrun when available to run install_name_tool 

This hopefully should help in situations like Jonathan Aquilina's,
where /usr/bin/install_name_tool does not correspond to the tool-chain
used (but is from an earlier version of Xcode).

Change-Id: I5b4ca9e5e163fb4a84967577d2146cdbe8344f03
üst 642b86aa
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
config_host.mk.in
Dosyayı görüntüle @ f5bdeec9
...@@ -696,6 +696,7 @@ export WPG_TARBALL=@WPG_TARBALL@ ...@@ -696,6 +696,7 @@ export WPG_TARBALL=@WPG_TARBALL@
export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@ export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@ export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
export WPS_TARBALL=@WPS_TARBALL@ export WPS_TARBALL=@WPS_TARBALL@
export XCRUN=@XCRUN@
export XINERAMA_LINK=@XINERAMA_LINK@ export XINERAMA_LINK=@XINERAMA_LINK@
export XMLLINT=@XMLLINT@ export XMLLINT=@XMLLINT@
export XPDF_TARBALL=@XPDF_TARBALL@ export XPDF_TARBALL=@XPDF_TARBALL@
......
configure.ac
Dosyayı görüntüle @ f5bdeec9
...@@ -2760,6 +2760,7 @@ if test "$_os" = "Darwin"; then ...@@ -2760,6 +2760,7 @@ if test "$_os" = "Darwin"; then
10.7|10.8) 10.7|10.8)
CC="`xcrun -find clang` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" 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" CXX="`xcrun -find clang++` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
XCRUN=xcrun
;; ;;
esac esac
AC_MSG_RESULT([$CC and $CXX]) AC_MSG_RESULT([$CC and $CXX])
...@@ -2808,6 +2809,7 @@ AC_SUBST(MACOSX_SDK_VERSION) ...@@ -2808,6 +2809,7 @@ AC_SUBST(MACOSX_SDK_VERSION)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED) AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
AC_SUBST(XCRUN)
dnl =================================================================== dnl ===================================================================
dnl Windows specific tests and stuff dnl Windows specific tests and stuff
......
mysqlc/source/makefile.mk
Dosyayı görüntüle @ f5bdeec9
...@@ -251,7 +251,7 @@ $(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE) ...@@ -251,7 +251,7 @@ $(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@ > $(NULLDEV) @$(COPY) $< $@ > $(NULLDEV)
.IF "$(OS)" == "MACOSX" .IF "$(OS)" == "MACOSX"
install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@ $(XCRUN) install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@
.ENDIF .ENDIF
.ENDIF .ENDIF
...@@ -261,7 +261,7 @@ $(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE) ...@@ -261,7 +261,7 @@ $(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@ > $(NULLDEV) @$(COPY) $< $@ > $(NULLDEV)
.IF "$(OS)" == "MACOSX" .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
.ENDIF .ENDIF
...@@ -269,5 +269,5 @@ $(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE) ...@@ -269,5 +269,5 @@ $(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE)
$(EXTENSION_TARGET): adjust_libmysql_path $(EXTENSION_TARGET): adjust_libmysql_path
adjust_libmysql_path: $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) 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 .ENDIF
odk/settings/settings.mk
Dosyayı görüntüle @ f5bdeec9
...@@ -459,9 +459,9 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________________________________________________ ...@@ -459,9 +459,9 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________________________________________________
REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib' 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' 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= EMPTYSTRING=
PATH_SEPARATOR=: PATH_SEPARATOR=:
......
python/makefile.mk
Dosyayı görüntüle @ f5bdeec9
...@@ -256,7 +256,7 @@ cd \"$$origpath\"\n\ ...@@ -256,7 +256,7 @@ cd \"$$origpath\"\n\
$(PACKAGE_DIR)/fixinstallnames: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(PACKAGE_DIR)/fixinstallnames: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
@echo remove build installdir from OOoPython @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 \ /$(my_prefix)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython \
@executable_path/../../../../OOoPython \ @executable_path/../../../../OOoPython \
$(MYCWD)/$(my_prefix)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/Resources/Python.app/Contents/MacOS/OOoPython $(MYCWD)/$(my_prefix)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/Resources/Python.app/Contents/MacOS/OOoPython
......
solenv/bin/macosx-change-install-names.pl
Dosyayı görüntüle @ f5bdeec9
...@@ -101,7 +101,7 @@ foreach $file (@ARGV) ...@@ -101,7 +101,7 @@ foreach $file (@ARGV)
close(IN); close(IN);
if ($change ne "") if ($change ne "")
{ {
$call = "install_name_tool$change $file"; $call = "$ENV{'XCRUN'} install_name_tool$change $file";
system($call) == 0 or die "cannot $call"; system($call) == 0 or die "cannot $call";
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment