Skip to content

Commit 5801569

Browse files
committed
build: remove build support for Intel Macs (host machine)
there have not been Intel Macs produced in a long time, and there is an associated maintenance cost associated with debugging build issues on INtel Macs. We will now remove support for Intel Macs to build newer versions of cockraoch but can still be cross built Part of: DEVINF-1607 <what was there before: Previously, ...> <why it needed to change: This was inadequate because ...> <what you did about it: To address this, this patch ...>
1 parent 86eb0d0 commit 5801569

File tree

5 files changed

+2
-14
lines changed

5 files changed

+2
-14
lines changed

WORKSPACE

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ load(
185185
go_download_sdk(
186186
name = "go_sdk",
187187
sdks = {
188-
"darwin_amd64": ("go1.25.3.darwin-amd64.tar.gz", "2ba409dd10128f529c2b44623b559e0b7890e5f210a311325215a5ae5879474d"),
189188
"darwin_arm64": ("go1.25.3.darwin-arm64.tar.gz", "746818c3703980b10279f9afec54145b35b0e3d5801fe6f5bdceeea53bcb6792"),
190189
"linux_amd64": ("go1.25.3.linux-amd64.tar.gz", "821f2ede78f535fe10f95c38e2c6c87bbc200649dee20068ae4424de400196c7"),
191190
"linux_arm64": ("go1.25.3.linux-arm64.tar.gz", "f6537bed6500b20d3ac1c8fd2e27609cb3c89b5e54579e344c09febb651e9598"),
@@ -583,17 +582,14 @@ register_toolchains(
583582
"//build/toolchains:cross_arm64_windows_toolchain",
584583
"//build/toolchains:cross_arm64_macos_toolchain",
585584
"//build/toolchains:cross_arm64_macos_arm_toolchain",
586-
"@copy_directory_toolchains//:darwin_amd64_toolchain",
587585
"@copy_directory_toolchains//:darwin_arm64_toolchain",
588586
"@copy_directory_toolchains//:linux_amd64_toolchain",
589587
"@copy_directory_toolchains//:linux_arm64_toolchain",
590588
"@copy_directory_toolchains//:windows_amd64_toolchain",
591-
"@copy_to_directory_toolchains//:darwin_amd64_toolchain",
592589
"@copy_to_directory_toolchains//:darwin_arm64_toolchain",
593590
"@copy_to_directory_toolchains//:linux_amd64_toolchain",
594591
"@copy_to_directory_toolchains//:linux_arm64_toolchain",
595592
"@copy_to_directory_toolchains//:windows_amd64_toolchain",
596-
"@nodejs_toolchains//:darwin_amd64_toolchain",
597593
"@nodejs_toolchains//:darwin_arm64_toolchain",
598594
"@nodejs_toolchains//:linux_amd64_toolchain",
599595
"@nodejs_toolchains//:linux_arm64_toolchain",

build/bazelutil/distdir_files.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,6 @@ DISTDIR_FILES = {
11851185
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macos.20250801-193032.tar.gz": "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
11861186
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macosarm.20250801-193032.tar.gz": "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
11871187
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.windows.20250801-193032.tar.gz": "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
1188-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.darwin-amd64.tar.gz": "2ba409dd10128f529c2b44623b559e0b7890e5f210a311325215a5ae5879474d",
11891188
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.darwin-arm64.tar.gz": "746818c3703980b10279f9afec54145b35b0e3d5801fe6f5bdceeea53bcb6792",
11901189
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-amd64.tar.gz": "821f2ede78f535fe10f95c38e2c6c87bbc200649dee20068ae4424de400196c7",
11911190
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-arm64.tar.gz": "f6537bed6500b20d3ac1c8fd2e27609cb3c89b5e54579e344c09febb651e9598",

build/nodejs.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ load("@rules_nodejs//nodejs/private:toolchains_repo.bzl", "toolchains_repo")
66

77
_NODE_VERSION = "16.14.2"
88
_NODE_VERSIONS = {
9-
"darwin_amd64": ("node-v16.14.2-darwin-x64.tar.gz", "node-v16.14.2-darwin-x64", "d3076ca7fcc7269c8ff9b03fe7d1c277d913a7e84a46a14eff4af7791ff9d055"),
109
"darwin_arm64": ("node-v16.14.2-darwin-arm64.tar.gz", "node-v16.14.2-darwin-arm64", "a66d9217d2003bd416d3dd06dfd2c7a044c4c9ff2e43a27865790bd0d59c682d"),
1110
"linux_amd64": ("node-v16.14.2-linux-x64.tar.xz", "node-v16.14.2-linux-x64", "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b"),
1211
"linux_arm64": ("node-v16.14.2-linux-arm64.tar.xz", "node-v16.14.2-linux-arm64", "f7c5a573c06a520d6c2318f6ae204141b8420386553a692fc359f8ae3d88df96"),
@@ -21,7 +20,6 @@ _URL_PREFIX = "https://storage.googleapis.com/public-bazel-artifacts/js/aspect-b
2120
_COPY_DIRECTORY_URL_PREFIX = _URL_PREFIX + "/copy_directory-"
2221

2322
_COPY_DIRECTORY_VERSIONS = {
24-
"darwin_amd64": "2f4befad49d25f867221f9beb7d03b174c03af5395fc860c24447c85fbdd2d7d",
2523
"darwin_arm64": "e8ca2ab1655cc71fab3106d433dd4274389bdf9f143f586ab83a6f8ab7aeabad",
2624
"linux_amd64": "fae863215e3acc6e5e50ac2979e6d9d29c95b57fa1eb719de801926db57e5941",
2725
"linux_arm64": "7dff652aa2b1e4d5ab163cf2be841038da1cc3530e9875d5fb2cef0ef4e9efb8",
@@ -32,7 +30,6 @@ _COPY_DIRECTORY_VERSIONS = {
3230
_COPY_TO_DIRECTORY_URL_PREFIX = _URL_PREFIX + "/copy_to_directory-"
3331

3432
_COPY_TO_DIRECTORY_VERSIONS = {
35-
"darwin_amd64": "6132ce07141ed17d658acb72a777bf619b17a18b6f3950b3689ac057f81ebdb0",
3633
"darwin_arm64": "fe8ba630878178adcebe52097dde407b1554c6118c3a17b67c0f47f461c7b3d5",
3734
"linux_amd64": "6ce36555a198a42fa1642b19fcd685d9584fb71e0da9b9fec15dc14f43527171",
3835
"linux_arm64": "17015a948a3d106222c157925a4b5edc832d336beb5fc7f8d34a7ee0c827809d",

build/scripts/build-bazel-lib-helpers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -euxo pipefail
1010
THIS_DIR=$(cd "$(dirname "$0")" && pwd)
1111
BIN_DIR=$(realpath $THIS_DIR/../../bin/aspect-bazel-lib-utils-$(date +%Y%m%d-%H%M%S))
1212

13-
PLATS=(darwin_amd64 darwin_arm64 linux_amd64 linux_arm64 linux_s390x windows_amd64)
13+
PLATS=(darwin_arm64 linux_amd64 linux_arm64 linux_s390x windows_amd64)
1414

1515
mkdir -p $BIN_DIR
1616

build/teamcity/internal/release/build-and-publish-patched-go/impl.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cd go
6969
git checkout $GOCOMMIT
7070
cd ..
7171
72-
CONFIGS="linux_amd64 linux_arm64 linux_s390x darwin_amd64 darwin_arm64 windows_amd64"
72+
CONFIGS="linux_amd64 linux_arm64 linux_s390x darwin_arm64 windows_amd64"
7373
7474
for CONFIG in $CONFIGS; do
7575
case $CONFIG in
@@ -85,10 +85,6 @@ for CONFIG in $CONFIGS; do
8585
CC_FOR_TARGET=/x-tools/s390x-ibm-linux-gnu/bin/s390x-ibm-linux-gnu-cc
8686
CXX_FOR_TARGET=/x-tools/s390x-ibm-linux-gnu/bin/s390x-ibm-linux-gnu-c++
8787
;;
88-
darwin_amd64)
89-
CC_FOR_TARGET=/x-tools/x86_64-apple-darwin21.2/bin/x86_64-apple-darwin21.2-cc
90-
CXX_FOR_TARGET=/x-tools/x86_64-apple-darwin21.2/bin/x86_64-apple-darwin21.2-c++
91-
;;
9288
darwin_arm64)
9389
CC_FOR_TARGET=/x-tools/x86_64-apple-darwin21.2/bin/aarch64-apple-darwin21.2-cc
9490
CXX_FOR_TARGET=/x-tools/x86_64-apple-darwin21.2/bin/aarch64-apple-darwin21.2-c++

0 commit comments

Comments
 (0)