Skip to content

Commit 8728186

Browse files
committed
Fix long-standing bug in GNUmakefile that prevented embedded builds of Wish from being generated on macOS
1 parent cb11034 commit 8728186

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

macosx/GNUmakefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,18 @@ else
272272
rm -rf Frameworks/Tcl.framework/{,/Versions/${TCL_VERSION}}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \
273273
rm -rf Frameworks/Tk.framework/{,/Versions/${VERSION}}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \
274274
fix_install_id ( ) { \
275-
chmod -RH a+w "$$1"; \
276-
install_name_tool -id $$(otool -L "$$1" | awk "/$$2\.framework.*[^:]\$$/ {sub(\"^.*/Frameworks\",\"@executable_path/../Frameworks\",\$$1); print \$$1}") "$$1"; \
277-
chmod -RH a-w "$$1"; \
275+
chmod -RH a+w "$$1"; \
276+
OLD=$$(otool -L "$$1" | awk "/$$2\\.framework.*[^:]\$$/ {print \$$1}"); \
277+
NEW=$$(echo "$$OLD" | sed "s|^.*/Frameworks|@executable_path/../Frameworks|"); \
278+
install_name_tool -id "$$NEW" "$$1"; \
279+
chmod -RH a-w "$$1"; \
278280
} && \
279281
fix_install_name ( ) { \
280-
chmod -RH a+w "$$1"; \
281-
install_name_tool -change $$(otool -L "$$1" | awk "/$$2\.framework.*[^:]\$$/ {print \$$1; sub(\"^.*/Frameworks\",\"@executable_path/../Frameworks\",\$$1); print \$$1}") "$$1"; \
282-
chmod -RH a-w "$$1"; \
282+
chmod -RH a+w "$$1"; \
283+
OLD=$$(otool -L "$$1" | awk "/$$2\\.framework.*[^:]\$$/ {print \$$1}"); \
284+
NEW=$$(echo "$$OLD" | sed "s|^.*/Frameworks|@executable_path/../Frameworks|"); \
285+
install_name_tool -change "$$OLD" "$$NEW" "$$1"; \
286+
chmod -RH a-w "$$1"; \
283287
} && \
284288
fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \
285289
fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk

0 commit comments

Comments
 (0)