From c7a503a8eaa760499cde00aba86146e8e1ed95ee Mon Sep 17 00:00:00 2001 From: Scott Bennett Date: Mon, 23 Jan 2023 01:50:50 -0800 Subject: [PATCH 1/2] Add .wasm cc artifact executable extension This allows creating a custom cc_toolchain that compiles to WebAssembly that outputs a wasm file with the standard extension, without needing to have a genrule that renames the file Closes #16091. PiperOrigin-RevId: 503921110 Change-Id: I3ed9e50a945d2e415e2ab34bd99ceea481c987f0 --- .../google/devtools/build/lib/rules/cpp/ArtifactCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java index 1a2416c7875545..ac5788372ad0f1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java @@ -23,7 +23,7 @@ public enum ArtifactCategory { STATIC_LIBRARY("lib", ".a", ".lib"), ALWAYSLINK_STATIC_LIBRARY("lib", ".lo", ".lo.lib"), DYNAMIC_LIBRARY("lib", ".so", ".dylib", ".dll"), - EXECUTABLE("", "", ".exe"), + EXECUTABLE("", "", ".exe", ".wasm"), INTERFACE_LIBRARY("lib", ".ifso", ".tbd", ".if.lib", ".lib"), PIC_FILE("", ".pic"), INCLUDED_FILE_LIST("", ".d"), From 71c8cb1aa35701c9a5aa80ea04955e499ba00656 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Mon, 6 Feb 2023 21:12:57 -0800 Subject: [PATCH 2/2] Add .wasm cc dynamic library extension Similar to #16091 except also allow the `.wasm` extension for dynamic libraries. Closes #17374. PiperOrigin-RevId: 507668339 Change-Id: Id85f98bb804e573e5f93a922b67baf75a22baf16 --- .../google/devtools/build/lib/rules/cpp/ArtifactCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java index ac5788372ad0f1..e726c63b59e5bd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java @@ -22,7 +22,7 @@ public enum ArtifactCategory { STATIC_LIBRARY("lib", ".a", ".lib"), ALWAYSLINK_STATIC_LIBRARY("lib", ".lo", ".lo.lib"), - DYNAMIC_LIBRARY("lib", ".so", ".dylib", ".dll"), + DYNAMIC_LIBRARY("lib", ".so", ".dylib", ".dll", ".wasm"), EXECUTABLE("", "", ".exe", ".wasm"), INTERFACE_LIBRARY("lib", ".ifso", ".tbd", ".if.lib", ".lib"), PIC_FILE("", ".pic"),