From b8ae520a830071164e98f4c534d176f90ac8377f Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Wed, 24 Mar 2021 11:16:46 +0000 Subject: [PATCH] fixup! build: update Makefile to support fat binary --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e78613ebd81404..6eda44a4532829 100644 --- a/Makefile +++ b/Makefile @@ -990,20 +990,20 @@ $(PKG): release-only --release-urlbase=$(RELEASE_URLBASE) \ $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) arch -x86_64 $(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/x64/node - SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" sh \ + SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/x64/node/usr/local" sh \ tools/osx-codesign.sh $(PYTHON) ./configure \ --dest-cpu=arm64 \ --tag=$(TAG) \ --release-urlbase=$(RELEASE_URLBASE) \ $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) - $(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/arm64/node - lipo $(MACOSOUTDIR)/dist/x64/node/usr/local/bin/node \ - $(MACOSOUTDIR)/dist/arm64/node/usr/local/bin/node \ - -output $(MACOSOUTDIR)/dist/node \ - -create + $(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/node SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" sh \ tools/osx-codesign.sh + lipo $(MACOSOUTDIR)/dist/x64/node/usr/local/bin/node \ + $(MACOSOUTDIR)/dist/node/usr/local/bin/node \ + -output $(MACOSOUTDIR)/dist/node/usr/local/bin/node \ + -create mkdir -p $(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules mkdir -p $(MACOSOUTDIR)/pkgs mv $(MACOSOUTDIR)/dist/node/usr/local/lib/node_modules/npm \