Skip to content

Commit 7ce40ed

Browse files
committed
Bump Zig to version 0.15.2 in Makefile
1 parent 4a4c752 commit 7ce40ed

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ else ifeq ($(ARCH),arm64)
436436
ARCH := aarch64
437437
endif
438438

439-
ZIG_VERSION := 0.15.1
439+
ZIG_VERSION := 0.15.2
440440
ZIG_BINARY := zig-$(ZIG_VERSION)
441441

442442
bin/zig-$(ZIG_VERSION):

scripts/sandbox.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def main() -> int:
5050
# target glibc 2.28 or newer (supports FORTIFY_SOURCE)
5151
target = "s390x-linux-gnu.2.34"
5252
additional_arguments = [
53-
f"--volume={os.getcwd()}/bin/zig-0.15.1:/mnt",
53+
f"--volume={os.getcwd()}/bin/zig-0.15.2:/mnt",
5454
# f"--env=CC=/mnt/zig cc -target {target}",
5555
# f"--env=CXX=/mnt/zig c++ -target {target}",
5656
# f"--env=CC=/mnt/zig-cc",
@@ -144,12 +144,12 @@ def buildinputs(
144144
) -> list[pathlib.Path]:
145145
if not (ROOT_DIR / "bin/buildinputs").exists():
146146
subprocess.check_call([MAKE, "bin/buildinputs"], cwd=ROOT_DIR)
147-
if not (ROOT_DIR / "bin/zig-0.15.1").exists():
148-
subprocess.check_call([MAKE, "bin/zig-0.15.1"], cwd=ROOT_DIR)
149-
if not (ROOT_DIR / "bin/zig-0.15.1/zigcc").exists():
147+
if not (ROOT_DIR / "bin/zig-0.15.2").exists():
148+
subprocess.check_call([MAKE, "bin/zig-0.15.2"], cwd=ROOT_DIR)
149+
if not (ROOT_DIR / "bin/zig-0.15.2/zigcc").exists():
150150
subprocess.check_call([MAKE, "build"], cwd=ROOT_DIR / "scripts/zigcc")
151-
shutil.copy(ROOT_DIR / "scripts/zigcc/bin/zigcc", ROOT_DIR / "bin/zig-0.15.1/zig-cc")
152-
shutil.copy(ROOT_DIR / "scripts/zigcc/bin/zigcc", ROOT_DIR / "bin/zig-0.15.1/zig-c++")
151+
shutil.copy(ROOT_DIR / "scripts/zigcc/bin/zigcc", ROOT_DIR / "bin/zig-0.15.2/zig-cc")
152+
shutil.copy(ROOT_DIR / "scripts/zigcc/bin/zigcc", ROOT_DIR / "bin/zig-0.15.2/zig-c++")
153153
stdout = subprocess.check_output([ROOT_DIR / "bin/buildinputs", str(dockerfile)],
154154
text=True, cwd=ROOT_DIR,
155155
env={"TARGETPLATFORM": platform, **os.environ})

0 commit comments

Comments
 (0)