@@ -10,6 +10,7 @@ TEST_CI_ARGS ?=
10
10
STAGINGSERVER ?= node-www
11
11
LOGLEVEL ?= silent
12
12
OSTYPE := $(shell uname -s | tr '[:upper:]' '[:lower:]')
13
+ ARCHTYPE := $(shell uname -m | tr '[:upper:]' '[:lower:]')
13
14
COVTESTS ?= test-cov
14
15
COV_SKIP_TESTS ?= core_line_numbers.js,testFinalizer.js,test_function/test.js
15
16
GTEST_FILTER ?= "*"
@@ -962,6 +963,14 @@ release-only: check-xz
962
963
fi
963
964
964
965
$(PKG ) : release-only
966
+ ifneq ($(OSTYPE ) ,darwin)
967
+ $(warning Invalid OSTYPE)
968
+ $(error OSTYPE should be `darwin` currently is $(OSTYPE))
969
+ endif
970
+ ifneq ($(ARCHTYPE ) ,arm64)
971
+ $(warning Invalid ARCHTYPE)
972
+ $(error ARCHTYPE should be `arm64` currently is $(ARCHTYPE))
973
+ endif
965
974
$(RM) -r $(MACOSOUTDIR)
966
975
mkdir -p $(MACOSOUTDIR)/installer/productbuild
967
976
cat tools/macos-installer/productbuild/distribution.xml.tmpl \
@@ -982,14 +991,28 @@ $(PKG): release-only
982
991
| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
983
992
>$(MACOSOUTDIR)/installer/productbuild/Resources/$$lang/conclusion.html ; \
984
993
done
994
+ CC_host="cc -arch x86_64" CXX_host="c++ -arch x86_64" \
995
+ CC_target="cc -arch x86_64" CXX_target="c++ -arch x86_64" \
996
+ CC="cc -arch x86_64" CXX="c++ -arch x86_64" $(PYTHON) ./configure \
997
+ --dest-cpu=x86_64 \
998
+ --tag=$(TAG) \
999
+ --release-urlbase=$(RELEASE_URLBASE) \
1000
+ $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
1001
+ arch -x86_64 $(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/x64/node
1002
+ SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/x64/node/usr/local" sh \
1003
+ tools/osx-codesign.sh
985
1004
$(PYTHON) ./configure \
986
- --dest-cpu=x64 \
1005
+ --dest-cpu=arm64 \
987
1006
--tag=$(TAG) \
988
1007
--release-urlbase=$(RELEASE_URLBASE) \
989
1008
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
990
1009
$(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/node
991
1010
SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" sh \
992
1011
tools/osx-codesign.sh
1012
+ lipo $(MACOSOUTDIR)/dist/x64/node/usr/local/bin/node \
1013
+ $(MACOSOUTDIR)/dist/node/usr/local/bin/node \
1014
+ -output $(MACOSOUTDIR)/dist/node/usr/local/bin/node \
1015
+ -create
993
1016
mkdir -p $(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules
994
1017
mkdir -p $(MACOSOUTDIR)/pkgs
995
1018
mv $(MACOSOUTDIR)/dist/node/usr/local/lib/node_modules/npm \
0 commit comments