| ... | @@ -20,8 +20,8 @@ git config core.abbrev 9 | ... | @@ -20,8 +20,8 @@ git config core.abbrev 9 |
| 20 | git fetch --unshallow || true | 20 | git fetch --unshallow || true |
| 21 | git fetch --tags | 21 | git fetch --tags |
| 22 | | 22 | |
| 23 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | 23 | #export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" |
| 24 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | 24 | #export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" |
| 25 | | 25 | |
| 26 | rm -rf build-release | 26 | rm -rf build-release |
| 27 | mkdir build-release | 27 | mkdir build-release |
| ... | @@ -33,22 +33,22 @@ cd build-release | ... | @@ -33,22 +33,22 @@ cd build-release |
| 33 | export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache" | 33 | export ZIG_GLOBAL_CACHE_DIR="$(pwd)/zig-global-cache" |
| 34 | export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache" | 34 | export ZIG_LOCAL_CACHE_DIR="$(pwd)/zig-local-cache" |
| 35 | | 35 | |
| 36 | cmake .. \ | 36 | #cmake .. \ |
| 37 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 37 | # -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 38 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 38 | # -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 39 | -DCMAKE_BUILD_TYPE=Release \ | 39 | # -DCMAKE_BUILD_TYPE=Release \ |
| 40 | -DZIG_TARGET_TRIPLE="$TARGET" \ | 40 | # -DZIG_TARGET_TRIPLE="$TARGET" \ |
| 41 | -DZIG_TARGET_MCPU="$MCPU" \ | 41 | # -DZIG_TARGET_MCPU="$MCPU" \ |
| 42 | -DZIG_STATIC=ON \ | 42 | # -DZIG_STATIC=ON \ |
| 43 | -DZIG_NO_LIB=ON \ | 43 | # -DZIG_NO_LIB=ON \ |
| 44 | -GNinja | 44 | # -GNinja |
| 45 | | 45 | # |
| 46 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | 46 | ## Now cmake will use zig as the C/C++ compiler. We reset the environment variables |
| 47 | # so that installation and testing do not get affected by them. | 47 | ## so that installation and testing do not get affected by them. |
| 48 | unset CC | 48 | #unset CC |
| 49 | unset CXX | 49 | #unset CXX |
| 50 | | 50 | # |
| 51 | ninja install | 51 | #ninja install |
| 52 | | 52 | |
| 53 | ## TODO: move this to a build.zig step (check-fmt) | 53 | ## TODO: move this to a build.zig step (check-fmt) |
| 54 | #echo "Looking for non-conforming code formatting..." | 54 | #echo "Looking for non-conforming code formatting..." |
| ... | @@ -74,8 +74,8 @@ ninja install | ... | @@ -74,8 +74,8 @@ ninja install |
| 74 | ## TODO: move this to a build.zig flag (-Denable-tidy) | 74 | ## TODO: move this to a build.zig flag (-Denable-tidy) |
| 75 | #tidy --drop-empty-elements no -qe "../zig-out/doc/langref.html" | 75 | #tidy --drop-empty-elements no -qe "../zig-out/doc/langref.html" |
| 76 | | 76 | |
| 77 | # Ensure that updating the wasm binary from this commit will result in a viable build. | 77 | ## Ensure that updating the wasm binary from this commit will result in a viable build. |
| 78 | stage3-release/bin/zig build update-zig1 | 78 | #stage3-release/bin/zig build update-zig1 |
| 79 | | 79 | |
| 80 | rm -rf ../build-new | 80 | rm -rf ../build-new |
| 81 | mkdir ../build-new | 81 | mkdir ../build-new |
Andrew Kelley <andrew@ziglang.org> 2023-09-14 18:46:54-07:00