Move more Makefile and PathOfBuilding editing into shell scripts; try to fix build for Mac 10.13

Author: hsource

Makefile

@@ -43,12 +43,6 @@ pob: load_pob luacurl frontend
 	cp -rf PathOfBuilding PathOfBuildingBuild; \
 	pushd PathOfBuildingBuild; \
 	bash ../editPathOfBuildingBuild.sh; \
-	unzip runtime-win32.zip lua/xml.lua lua/base64.lua lua/sha1.lua; \
-	mv lua/*.lua .; \
-	rmdir lua; \
-	cp ../lcurl.so .; \
-	mv src/* .; \
-	rmdir src; \
 	popd
 
 frontend: 
@@ -60,20 +54,10 @@ load_pob:
 	git add . && git fetch && git reset --hard origin/dev; \
 	popd
 
-# The seds below ensure that:
-#
-# - we only replace `lua` with `luajit` once
-# - we use pkg-config to find the right path for curl libraries
-# - we use gcc-12 from Homebrew instead of clang, to ensure that we build
-#   the x86_64 library on ARM systems
-# - we target only MacOS 10.5 or later; otherwise, we get an error
 luacurl:
 	git clone --depth 1 https://github.com/Lua-cURL/Lua-cURLv3.git; \
-	pushd Lua-cURLv3; \
-	sed -i '' 's/\?= lua$$/\?= luajit/' Makefile; \
-	sed -i '' 's@shell .* --libs libcurl@shell PKG_CONFIG_PATH=\$$\$$(arch --x86_64 brew --prefix --installed curl)/lib/pkgconfig \$$(PKG_CONFIG) --libs libcurl@' Makefile; \
-    sed -i '' 's@?= \$$(MAC_ENV) gcc$$@ = \$$(MAC_ENV) arch=x86_64 gcc-12@' Makefile; \
-    sed -i '' "s@MACOSX_DEPLOYMENT_TARGET='10.3'@MACOSX_DEPLOYMENT_TARGET='10.5'@" Makefile; \
+	bash editLuaCurlMakefile.sh; \
+    pushd Lua-cURLv3; \
 	make; \
 	mv lcurl.so ../lcurl.so; \
 	popd

editLuaCurlMakefile.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+pushd Lua-cURLv3
+
+# We only replace `lua` with `luajit` once
+sed -i '' 's/?= lua$/?= luajit/' Makefile
+# We use pkg-config to find the right path for curl libraries
+sed -i '' 's@shell .* --libs libcurl@shell PKG_CONFIG_PATH=$$(arch --x86_64 brew --prefix --installed curl)/lib/pkgconfig $(PKG_CONFIG) --libs libcurl@' Makefile
+# We use the Homebrew installed GCC and build for x86_64 to ensure we build the
+# x86_64 library, even on ARM systems
+sed -i '' 's@?= \$(MAC_ENV) gcc$@ = \$(MAC_ENV) arch=x86_64 gcc-12@' Makefile
+# We target only MacOS 10.8 or later; otherwise, we get an error. We get an
+# error for targeting <10.5 and a warning for <10.8
+sed -i '' "s@MACOSX_DEPLOYMENT_TARGET='10.3'@MACOSX_DEPLOYMENT_TARGET='10.8'@" Makefile
+
+# Some users on old versions of MacOS 10.13 run into the error:
+# dyld: cannot load 'PathOfBuilding' (load command 0x80000034 is unknown)
+#
+# It looks like 0x80000034 is associated with the fixup_chains optimization
+# that improves startup time:
+# https://www.emergetools.com/blog/posts/iOS15LaunchTime
+#
+# For compatibility, we disable that using the flag from this thread:
+# https://github.com/python/cpython/issues/97524
+if ! grep -q "LDFLAGS           =" Makefile; then
+  sed -i '' '/LIBS              =/a\
+LDFLAGS           = -Wl,-no_fixup_chains
+' Makefile
+fi
+popd

editPathOfBuildingBuild.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$DIR/PathOfBuildingBuild"
 
 # We remove the `launch.devMode or` to ensure the user's builds are stored not in
 # the binary, but within their user directory
@@ -19,3 +18,11 @@ sed -E -i '' "$SED_COMMAND" src/Classes/TreeTab.lua
 sed -E -i '' "$SED_COMMAND" src/Modules/BuildSiteTools.lua
 # Do not remove SSL for LaunchInstall and Update as that's more sensitive, but
 # also unused.
+
+# Run remaining setup
+unzip runtime-win32.zip lua/xml.lua lua/base64.lua lua/sha1.lua
+mv lua/*.lua .
+rmdir lua
+cp ../lcurl.so .
+mv src/* .
+rmdir src