From 1f6fa8784e2331237091d73b9d679e47ac0957fc Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Mar 2023 15:48:17 -0700 Subject: [PATCH] macos release build: store architecture in a file. --- macos/Makefile | 3 +-- macos/make_macos_release.sh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/Makefile b/macos/Makefile index 4ccd00507a96..1537008e762a 100644 --- a/macos/Makefile +++ b/macos/Makefile @@ -1,5 +1,4 @@ -ARCHITECTURE=$(shell uname -m) - +ARCHITECTURE=$(shell cat architecture.txt) VERSION=$(shell cat version.txt) BASE=pandoc-$(VERSION)-$(ARCHITECTURE) DEST=pandoc/usr/local diff --git a/macos/make_macos_release.sh b/macos/make_macos_release.sh index 8f05500a48fe..9c552f7d5a44 100644 --- a/macos/make_macos_release.sh +++ b/macos/make_macos_release.sh @@ -41,6 +41,7 @@ chown -R "$ME:staff" "$ROOT" sed -e "s/PANDOCVERSION/$VERSION/; s/ARCHITECTURE/$MACHINE/;" macos/distribution.xml.in > "$ARTIFACTS/distribution.xml" cp macos/Makefile "$ARTIFACTS/" echo "$VERSION" > "$ARTIFACTS/version.txt" +echo "$MACHINE" > "$ARTIFACTS/architecture.txt" ls -R $ARTIFACTS echo "Finished..."