From 6536df1aaa397aeda16be870a7726f6b2ff67adb Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Fri, 10 Mar 2023 13:13:45 -0500 Subject: [PATCH 1/3] the sketch of a test -- but does not yet work to expose bug on my machine locally. --- tests/run-make/wasm-override-linker/Makefile | 6 ++++++ tests/run-make/wasm-override-linker/foo.rs | 1 + 2 files changed, 7 insertions(+) create mode 100644 tests/run-make/wasm-override-linker/Makefile create mode 100644 tests/run-make/wasm-override-linker/foo.rs diff --git a/tests/run-make/wasm-override-linker/Makefile b/tests/run-make/wasm-override-linker/Makefile new file mode 100644 index 0000000000000..9ecc2603c721f --- /dev/null +++ b/tests/run-make/wasm-override-linker/Makefile @@ -0,0 +1,6 @@ +include ../../run-make-fulldeps/tools.mk + +# only-wasm32-bare + +all: + $(RUSTC) foo.rs --crate-type cdylib --target wasm32-unknown-unknown -C linker=clang diff --git a/tests/run-make/wasm-override-linker/foo.rs b/tests/run-make/wasm-override-linker/foo.rs new file mode 100644 index 0000000000000..4bd8276f34927 --- /dev/null +++ b/tests/run-make/wasm-override-linker/foo.rs @@ -0,0 +1 @@ +// empty file From 98ae92a29e9c01e66a29f06c51bf617ec72fb7b0 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Tue, 14 Mar 2023 13:50:54 -0400 Subject: [PATCH 2/3] try to fix how Makefile is selected solely for wasm32-unknown-unknown target. --- tests/run-make/wasm-override-linker/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/run-make/wasm-override-linker/Makefile b/tests/run-make/wasm-override-linker/Makefile index 9ecc2603c721f..3c1b725eefb7e 100644 --- a/tests/run-make/wasm-override-linker/Makefile +++ b/tests/run-make/wasm-override-linker/Makefile @@ -1,6 +1,8 @@ include ../../run-make-fulldeps/tools.mk -# only-wasm32-bare - +ifeq ($(TARGET),wasm32-unknown-unknown) all: $(RUSTC) foo.rs --crate-type cdylib --target wasm32-unknown-unknown -C linker=clang +else +all: +endif From 238bf32ea1a4fefcaa86e80049597b8ba313242f Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Tue, 14 Mar 2023 14:36:09 -0400 Subject: [PATCH 3/3] DO NOT CHECK IN. temporarily adding wasm32 to try build set to see if my current run-make test works to catch failure in CI. --- .github/workflows/ci.yml | 3 +++ src/ci/github-actions/ci.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44f789c592ba2..74608c6b8a39c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,9 @@ jobs: tidy: false os: ubuntu-20.04-xl env: {} + - name: wasm32 + os: ubuntu-20.04-xl + env: {} timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 11f1532bef594..f076ab2b07aa5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -308,6 +308,9 @@ jobs: <<: *job-linux-xl tidy: false + - name: wasm32 + <<: *job-linux-xl + auto: permissions: actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds