Skip to content

Commit 18f39c9

Browse files
committed
stop building macOS amd64
1 parent 6648e8f commit 18f39c9

File tree

4 files changed

+1
-59
lines changed

4 files changed

+1
-59
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
2025-10-31 v25.10.0
22
===================
33

4-
Nimbus `v25.10.0` is a low-urgency release which increases the default gas limit to 60M, improves beacon API support, and adds runtime configuration flexibility.
4+
Nimbus `v25.10.0` is a low-urgency release which increases the default gas limit to 60M, improves beacon API support, adds runtime configuration flexibility, and removes macOS amd64 support.
55

66
### Improvements
77

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
9797
dist-arm64 \
9898
dist-arm \
9999
dist-win64 \
100-
dist-macos \
101100
dist-macos-arm64 \
102101
dist \
103102
local-testnet-minimal \
@@ -818,10 +817,6 @@ dist-win64:
818817
+ MAKE="$(MAKE)" \
819818
scripts/make_dist.sh win64
820819

821-
dist-macos:
822-
+ MAKE="$(MAKE)" \
823-
scripts/make_dist.sh macos
824-
825820
dist-macos-arm64:
826821
+ MAKE="$(MAKE)" \
827822
scripts/make_dist.sh macos-arm64
@@ -832,7 +827,6 @@ dist:
832827
+ $(MAKE) dist-arm64
833828
+ $(MAKE) dist-arm
834829
+ $(MAKE) dist-win64
835-
+ $(MAKE) dist-macos
836830
+ $(MAKE) dist-macos-arm64
837831

838832
#- Build and run benchmarks using an external repo (which can be used easily on

docker/dist/Dockerfile.macos

Lines changed: 0 additions & 20 deletions
This file was deleted.

docker/dist/entry_point.sh

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -102,36 +102,6 @@ elif [[ "${PLATFORM}" == "Linux_arm64v8" ]]; then
102102
NIMFLAGS="${NIMFLAGS_COMMON} --cpu:arm64 --gcc.exe=${CC} --gcc.linkerexe=${CC}" \
103103
PARTIAL_STATIC_LINKING=1 \
104104
${BINARIES}
105-
elif [[ "${PLATFORM}" == "macOS_amd64" ]]; then
106-
export PATH="/opt/osxcross/bin:${PATH}"
107-
export OSXCROSS_MP_INC=1 # sets up include and library paths
108-
export ZERO_AR_DATE=1 # avoid timestamps in binaries
109-
DARWIN_VER="20.4"
110-
CC="o64-clang"
111-
${CC} --version
112-
echo
113-
114-
make \
115-
-j$(nproc) \
116-
USE_LIBBACKTRACE=0 \
117-
QUICK_AND_DIRTY_COMPILER=1 \
118-
deps-common build/generate_makefile
119-
make \
120-
-j$(nproc) \
121-
CC="${CC}" \
122-
LIBTOOL="x86_64-apple-darwin${DARWIN_VER}-libtool" \
123-
OS="darwin" \
124-
NIMFLAGS="${NIMFLAGS_COMMON} --os:macosx --clang.exe=${CC}" \
125-
nat-libs
126-
make \
127-
LOG_LEVEL="TRACE" \
128-
CC="${CC}" \
129-
AR="x86_64-apple-darwin${DARWIN_VER}-ar" \
130-
RANLIB="x86_64-apple-darwin${DARWIN_VER}-ranlib" \
131-
DSYMUTIL="x86_64-apple-darwin${DARWIN_VER}-dsymutil" \
132-
FORCE_DSYMUTIL=1 \
133-
NIMFLAGS="${NIMFLAGS_COMMON} --os:macosx --clang.exe=${CC} --clang.linkerexe=${CC}" \
134-
${BINARIES}
135105
elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
136106
export PATH="/opt/osxcross/bin:${PATH}"
137107
export OSXCROSS_MP_INC=1 # sets up include and library paths
@@ -227,8 +197,6 @@ elif [[ "${PLATFORM}" == "Linux_arm64v8" ]]; then
227197
elif [[ "${PLATFORM}" == "Windows_amd64" ]]; then
228198
sed -i -e 's/^make dist$/make dist-win64/' "${DIST_PATH}/README.md"
229199
cp -a docker/dist/README-Windows.md.tpl "${DIST_PATH}/README-Windows.md"
230-
elif [[ "${PLATFORM}" == "macOS_amd64" ]]; then
231-
sed -i -e 's/^make dist$/make dist-macos/' "${DIST_PATH}/README.md"
232200
elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
233201
sed -i -e 's/^make dist$/make dist-macos-arm64/' "${DIST_PATH}/README.md"
234202
fi

0 commit comments

Comments
 (0)