| author |  Alex Rønne Petersen <alex@alexrp.com> 2026-09-09 14:08:15+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2026-09-09 18:22:16+02:00 |
| log | 47f132b7705f4ded6d671c1f5abe0b9003e57e44 |
| tree | 6cd1219fb5459fc39a4b2ee91cb38af6e3b05b68 |
| parent | b877cf3fe54c93117400aaf9ff72d92133b42c03 |
| signature | Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
ci: use CMAKE_{C,CXX}_COMPILER instead of the CC/CXX env dance
25 files changed, 52 insertions(+), 205 deletions(-)
ci
- aarch64-freebsd-debug.sh
- aarch64-freebsd-release.sh
- aarch64-linux-debug.sh
- aarch64-linux-release.sh
- aarch64-netbsd-debug.sh
- aarch64-netbsd-release.sh
- aarch64-openbsd-debug.sh
- aarch64-openbsd-release.sh
- loongarch64-linux-debug.sh
- loongarch64-linux-release.sh
- powerpc64le-linux-debug.sh
- powerpc64le-linux-release.sh
- riscv64-linux-debug.sh
- riscv64-linux-release.sh
- s390x-linux-debug.sh
- s390x-linux-release.sh
- x86_64-freebsd-debug.sh
- x86_64-freebsd-release.sh
- x86_64-linux-debug-llvm.sh
- x86_64-linux-debug.sh
- x86_64-linux-release.sh
- x86_64-netbsd-debug.sh
- x86_64-netbsd-release.sh
- x86_64-openbsd-debug.sh
- x86_64-openbsd-release.sh
ci/aarch64-freebsd-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-freebsd-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-linux-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-linux-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-netbsd-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-netbsd-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-openbsd-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/aarch64-openbsd-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/loongarch64-linux-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/loongarch64-linux-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/powerpc64le-linux-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/powerpc64le-linux-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/riscv64-linux-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/riscv64-linux-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/s390x-linux-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/s390x-linux-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-freebsd-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-freebsd-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-linux-debug-llvm.sh+2-8
| ... | @@ -22,13 +22,12 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,13 +22,12 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug-llvm | 22 | mkdir -p build-debug-llvm |
| 23 | cd build-debug-llvm | 23 | cd build-debug-llvm |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| ... | @@ -36,11 +35,6 @@ cmake .. \ | ... | @@ -36,11 +35,6 @@ cmake .. \ |
| 36 | -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \ | 35 | -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \ |
| 37 | -GNinja | 36 | -GNinja |
| 38 | 37 | ||
| 39 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 40 | # so that installation and testing do not get affected by them. | ||
| 41 | unset CC | ||
| 42 | unset CXX | ||
| 43 | |||
| 44 | ninja install | 38 | ninja install |
| 45 | 39 | ||
| 46 | # Must be done after zig cc is finished. | 40 | # Must be done after zig cc is finished. |
ci/x86_64-linux-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-linux-release.sh+4-13
| ... | @@ -28,24 +28,18 @@ cc -o bootstrap bootstrap.c | ... | @@ -28,24 +28,18 @@ cc -o bootstrap bootstrap.c |
| 28 | mkdir -p build-release | 28 | mkdir -p build-release |
| 29 | cd build-release | 29 | cd build-release |
| 30 | 30 | ||
| 31 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 32 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 33 | |||
| 34 | cmake .. \ | 31 | cmake .. \ |
| 35 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 32 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 36 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 33 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 37 | -DCMAKE_BUILD_TYPE=Release \ | 34 | -DCMAKE_BUILD_TYPE=Release \ |
| 35 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 36 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 38 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 37 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 39 | -DZIG_TARGET_MCPU="$MCPU" \ | 38 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 40 | -DZIG_STATIC=ON \ | 39 | -DZIG_STATIC=ON \ |
| 41 | -DZIG_NO_LIB=ON \ | 40 | -DZIG_NO_LIB=ON \ |
| 42 | -GNinja | 41 | -GNinja |
| 43 | 42 | ||
| 44 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 45 | # so that installation and testing do not get affected by them. | ||
| 46 | unset CC | ||
| 47 | unset CXX | ||
| 48 | |||
| 49 | ninja install | 43 | ninja install |
| 50 | 44 | ||
| 51 | # Must not be set while using the other `zig cc` which has its own zig lib dir. | 45 | # Must not be set while using the other `zig cc` which has its own zig lib dir. |
| ... | @@ -98,22 +92,19 @@ stage3-release/bin/zig build update-zig1 | ... | @@ -98,22 +92,19 @@ stage3-release/bin/zig build update-zig1 |
| 98 | mkdir -p ../build-new | 92 | mkdir -p ../build-new |
| 99 | cd ../build-new | 93 | cd ../build-new |
| 100 | 94 | ||
| 101 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 102 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 103 | unset ZIG_LIB_DIR | 95 | unset ZIG_LIB_DIR |
| 104 | 96 | ||
| 105 | cmake .. \ | 97 | cmake .. \ |
| 106 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 98 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 107 | -DCMAKE_BUILD_TYPE=Release \ | 99 | -DCMAKE_BUILD_TYPE=Release \ |
| 100 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 101 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 108 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 102 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 109 | -DZIG_TARGET_MCPU="$MCPU" \ | 103 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 110 | -DZIG_STATIC=ON \ | 104 | -DZIG_STATIC=ON \ |
| 111 | -DZIG_NO_LIB=ON \ | 105 | -DZIG_NO_LIB=ON \ |
| 112 | -GNinja | 106 | -GNinja |
| 113 | 107 | ||
| 114 | unset CC | ||
| 115 | unset CXX | ||
| 116 | |||
| 117 | ninja install | 108 | ninja install |
| 118 | 109 | ||
| 119 | export ZIG_LIB_DIR="$PWD/../lib" | 110 | export ZIG_LIB_DIR="$PWD/../lib" |
ci/x86_64-netbsd-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-netbsd-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-openbsd-debug.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-debug | 22 | mkdir -p build-debug |
| 23 | cd build-debug | 23 | cd build-debug |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Debug \ | 28 | -DCMAKE_BUILD_TYPE=Debug \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |
ci/x86_64-openbsd-release.sh+2-8
| ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" | ... | @@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" |
| 22 | mkdir -p build-release | 22 | mkdir -p build-release |
| 23 | cd build-release | 23 | cd build-release |
| 24 | 24 | ||
| 25 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 26 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 27 | |||
| 28 | cmake .. \ | 25 | cmake .. \ |
| 29 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 26 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 30 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 27 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 31 | -DCMAKE_BUILD_TYPE=Release \ | 28 | -DCMAKE_BUILD_TYPE=Release \ |
| 29 | -DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 30 | -DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \ | ||
| 32 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 31 | -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 33 | -DZIG_TARGET_MCPU="$MCPU" \ | 32 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | -DZIG_STATIC=ON \ | 33 | -DZIG_STATIC=ON \ |
| 35 | -DZIG_NO_LIB=ON \ | 34 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | ||
| 39 | # so that installation and testing do not get affected by them. | ||
| 40 | unset CC | ||
| 41 | unset CXX | ||
| 42 | |||
| 43 | ninja install | 37 | ninja install |
| 44 | 38 | ||
| 45 | # Must be done after zig cc is finished. | 39 | # Must be done after zig cc is finished. |