diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-22 12:13:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-22 12:23:18 +0200 |
| commit | f5bdeec992923a0eb3fb3357c1afe3d7fff93840 (patch) | |
| tree | b0a2165acc440d9b10205999ae68ea68d1efca36 /mysqlc | |
| parent | 642b86aa541aa977143ac5a084550f3390423926 (diff) | |
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
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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 |