diff options
| -rw-r--r-- | .github/workflows/mac-build.yml | 4 | ||||
| -rw-r--r-- | unix/Makefile.in | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index fa946d2..ea640d0 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -13,7 +13,7 @@ jobs: - name: Prepare run: | touch tclStubInit.c tclOOStubInit.c tclOOScript.h - wget https://github.com/culler/macher/releases/download/v1.1/macher + wget https://github.com/culler/macher/releases/download/v1.2/macher sudo cp macher /usr/local/bin sudo chmod a+x /usr/local/bin/macher working-directory: generic @@ -43,7 +43,7 @@ jobs: - name: Prepare run: | touch tclStubInit.c tclOOStubInit.c tclOOScript.h - wget https://github.com/culler/macher/releases/download/v1.1/macher + wget https://github.com/culler/macher/releases/download/v1.2/macher sudo cp macher /usr/local/bin sudo chmod a+x /usr/local/bin/macher mkdir "$HOME/install dir" diff --git a/unix/Makefile.in b/unix/Makefile.in index 7c87f07..df55f5d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -795,7 +795,8 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${TCL_ZIP_FILE} @if test "${ZIPFS_BUILD}" = "1" ; then \ if test "x$(MACHER)" = "x" ; then \ cat ${TCL_ZIP_FILE} >> ${LIB_FILE}; \ - else $(MACHER) append ${TCL_ZIP_FILE} ${LIB_FILE}; \ + else $(MACHER) append ${LIB_FILE} ${TCL_ZIP_FILE} /tmp/macher_output; \ + mv /tmp/macher_output ${LIB_FILE}; \ fi; \ ${NATIVE_ZIP} -A ${LIB_FILE} \ || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ @@ -825,7 +826,8 @@ ${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} ${TCL_ZIP_FILE} @if test "${ZIPFS_BUILD}" = "2" ; then \ if test "x$(MACHER)" = "x" ; then \ cat ${TCL_ZIP_FILE} >> ${TCL_EXE}; \ - else $(MACHER) append ${TCL_ZIP_FILE} ${TCL_EXE}; \ + else $(MACHER) append ${TCL_EXE} ${TCL_ZIP_FILE} /tmp/macher_output; \ + mv /tmp/macher_output ${TCL_EXE}; \ fi; \ ${NATIVE_ZIP} -A ${TCL_EXE} \ || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ |