Skip to content

Remove the macOS 26 DEVELOPER_DIR override #3029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzagozen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove the macOS 26 DEVELOPER_DIR override #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,13 +665,6 @@ dist/std: std std/Build.act std/build.zig std/build.zig.zon dist/base dist/bin/a
# the file and modify it, which the Linux kernel (and perhaps others?) will
# prevent if the file to be modified is an executable program that is currently
# running. We work around it by moving / renaming the file in place instead!
ifeq ($(OS),macos)
# Workaround for macOS 26.4 CLI tools breaking Zig: point DEVELOPER_DIR to
# /dev/null to prevent Zig from trying to use them and instead falling back to
# its own implementation.
# See https://codeberg.org/ziglang/zig/issues/31658.
dist/bin/actondb: export DEVELOPER_DIR := /dev/null
endif
dist/bin/actondb: $(DIST_ZIG) $(DEPS)
@mkdir -p $(dir $@)
cd dist/backend && "$(ZIG)" build -Donly_actondb $(if $(ACTON_ZIG_TARGET),-Dtarget=$(ACTON_ZIG_TARGET)) --prefix "$(TD)/dist"
Expand Down
5 changes: 1 addition & 4 deletions compiler/acton/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2476,14 +2476,11 @@ runZig gopts opts zigExe zigArgs paths wd mProgressUI = do
closeFd readFd `catch` ignoreIO
takeMVar doneVar
return (Just ("ZIG_PROGRESS", envVal), onStart', onStop', False)
let env1 = if System.Info.os == "darwin"
then ("DEVELOPER_DIR", "/dev/null") : filter ((/= "DEVELOPER_DIR") . fst) env0
else env0
homeDir <- getHomeDirectory
let zigEnv = [ ("ZIG_LOCAL_CACHE_DIR", joinPath [homeDir, ".cache", "acton", "zig-local-cache"])
, ("ZIG_GLOBAL_CACHE_DIR", joinPath [homeDir, ".cache", "acton", "zig-global-cache"])
]
envWithZigCache = foldr (\(k, v) acc -> (k, v) : filter ((/= k) . fst) acc) env1 zigEnv
envWithZigCache = foldr (\(k, v) acc -> (k, v) : filter ((/= k) . fst) acc) env0 zigEnv
env2 = case envOverride of
Nothing -> Just envWithZigCache
Just (k, v) -> Just ((k, v) : filter ((/= k) . fst) envWithZigCache)
Expand Down
3 changes: 0 additions & 3 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ done
TESTS= \
$(DDB_TESTS)
TLS_TEST_SERVER_ENV=
ifeq ($(shell uname -s),Darwin)
TLS_TEST_SERVER_ENV=DEVELOPER_DIR=$(or $(DEVELOPER_DIR),/dev/null)
endif
test:
$(MAKE) $(TESTS)

Expand Down
Loading