Stop passing -mcpu=sandybridge to wasm builds on x86
authorMatt Corallo <git@bluematt.me>
Sun, 16 Jan 2022 02:49:36 +0000 (02:49 +0000)
committerMatt Corallo <git@bluematt.me>
Sun, 16 Jan 2022 02:49:36 +0000 (02:49 +0000)
genbindings.sh

index 50b9acf2b397366a3f64e5e501142bb34a738316..238c720b66fa4e7ae407707a18e252c60ccb1a7e 100755 (executable)
@@ -486,9 +486,9 @@ if [ "$2" = "false" -a "$(rustc --print target-list | grep wasm32-wasi)" != "" ]
        if clang -nostdlib -o /dev/null --target=wasm32-wasi -Wl,--no-entry genbindings_wasm_test_file.c > /dev/null 2>&1; then
                # And if it does, build a WASM binary without capturing errors
                export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32 -O1"
-               RUSTFLAGS="$RUSTFLAGS -C opt-level=1 --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS -v --target=wasm32-wasi
+               RUSTFLAGS="$BASE_RUSTFLAGS -C opt-level=1 --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS -v --target=wasm32-wasi
                export CFLAGS_wasm32_wasi="$BASE_CFLAGS -fembed-bitcode -target wasm32 -Oz"
-               RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C opt-level=z -C linker-plugin-lto -C lto" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi
+               RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C opt-level=z -C linker-plugin-lto -C lto" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi
        else
                echo "Cannot build WASM lib as clang does not seem to support the wasm32-wasi target"
        fi