From f303db0181f7ff3993709e56353b9b7c42b366ff Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 21 Jul 2022 08:58:26 -0700 Subject: [PATCH] Revert "[bazel] Add additional files necessary for building with closure and on RBE (#1057)" This reverts commit 311acff345fd71dcfe5f350653cec466ee7e3fbc. --- bazel/emscripten_deps.bzl | 47 +++++---------------------------------- 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl index 5068fe0c46..d5f748f13f 100644 --- a/bazel/emscripten_deps.bzl +++ b/bazel/emscripten_deps.bzl @@ -18,32 +18,12 @@ filegroup( ]), ) -filegroup( - name = "emcc_common", - srcs = [ - "emscripten/emcc.py", - "emscripten/emscripten.py", - "emscripten/emscripten-version.txt", - "emscripten/cache/sysroot_install.stamp", - "emscripten/src/settings.js", - "emscripten/src/settings_internal.js", - ] + glob( - include = [ - "emscripten/third_party/**", - "emscripten/tools/**", - ], - exclude = [ - "**/__pycache__/**", - ], - ), -) - filegroup( name = "compiler_files", srcs = [ + "emscripten/emcc.py", "bin/clang{bin_extension}", "bin/clang++{bin_extension}", - ":emcc_common", ":includes", ], ) @@ -51,6 +31,7 @@ filegroup( filegroup( name = "linker_files", srcs = [ + "emscripten/emcc.py", "bin/clang{bin_extension}", "bin/llc{bin_extension}", "bin/llvm-ar{bin_extension}", @@ -59,33 +40,15 @@ filegroup( "bin/wasm-emscripten-finalize{bin_extension}", "bin/wasm-ld{bin_extension}", "bin/wasm-opt{bin_extension}", - "bin/wasm-metadce{bin_extension}", - ":emcc_common", - ] + glob( - include = [ - "emscripten/cache/sysroot/lib/**", - "emscripten/node_modules/**", - "emscripten/src/**", - ], - ), + ] + glob(["emscripten/node_modules/**"]), ) filegroup( name = "ar_files", srcs = [ - "bin/llvm-ar{bin_extension}", "emscripten/emar.py", - "emscripten/emscripten-version.txt", - "emscripten/src/settings.js", - "emscripten/src/settings_internal.js", - ] + glob( - include = [ - "emscripten/tools/**", - ], - exclude = [ - "**/__pycache__/**", - ], - ), + "bin/llvm-ar{bin_extension}", + ], ) """