Author: Nico Weber Date: 2022-11-21T08:54:14-05:00 New Revision: 281a5c7ef112d5d09dd947ecd3f85484047c5502
URL: https://github.com/llvm/llvm-project/commit/281a5c7ef112d5d09dd947ecd3f85484047c5502 DIFF: https://github.com/llvm/llvm-project/commit/281a5c7ef112d5d09dd947ecd3f85484047c5502.diff LOG: [llvm,polly,clang] Stop setting config.enable_shared in most places Clang's lit.cfg.py reads this to add an "enable-shared" feature that three of clang's lit tests use. Nothing else reads enable_shared, so remove it from most lit.site.cfg.py.in files. Differential Revision: https://reviews.llvm.org/D138301 Added: Modified: clang/test/Unit/lit.site.cfg.py.in llvm/test/Unit/lit.site.cfg.py.in llvm/test/lit.site.cfg.py.in llvm/utils/gn/secondary/clang/test/BUILD.gn llvm/utils/gn/secondary/llvm/test/BUILD.gn polly/test/Unit/lit.site.cfg.in Removed: ################################################################################ diff --git a/clang/test/Unit/lit.site.cfg.py.in b/clang/test/Unit/lit.site.cfg.py.in index 778ab2ef05156..842560dd99ea5 100644 --- a/clang/test/Unit/lit.site.cfg.py.in +++ b/clang/test/Unit/lit.site.cfg.py.in @@ -8,7 +8,6 @@ config.llvm_tools_dir = lit_config.substitute(path(r"@LLVM_TOOLS_DIR@")) config.llvm_libs_dir = lit_config.substitute(path(r"@LLVM_LIBS_DIR@")) config.llvm_build_mode = lit_config.substitute("@LLVM_BUILD_MODE@") config.clang_obj_root = path(r"@CLANG_BINARY_DIR@") -config.enable_shared = @ENABLE_SHARED@ config.shlibdir = lit_config.substitute(path(r"@SHLIBDIR@")) config.target_triple = "@LLVM_TARGET_TRIPLE@" diff --git a/llvm/test/Unit/lit.site.cfg.py.in b/llvm/test/Unit/lit.site.cfg.py.in index 9535dde62aee9..1d7d765801494 100644 --- a/llvm/test/Unit/lit.site.cfg.py.in +++ b/llvm/test/Unit/lit.site.cfg.py.in @@ -6,7 +6,6 @@ config.llvm_src_root = path(r"@LLVM_SOURCE_DIR@") config.llvm_obj_root = path(r"@LLVM_BINARY_DIR@") config.llvm_tools_dir = lit_config.substitute(path(r"@LLVM_TOOLS_DIR@")) config.llvm_build_mode = lit_config.substitute("@LLVM_BUILD_MODE@") -config.enable_shared = @ENABLE_SHARED@ config.shlibdir = lit_config.substitute(path(r"@SHLIBDIR@")) # Let the main config do the real work. diff --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in index 5531732e16bc3..a23355fbf24a1 100644 --- a/llvm/test/lit.site.cfg.py.in +++ b/llvm/test/lit.site.cfg.py.in @@ -22,7 +22,6 @@ config.ocamlfind_executable = "@OCAMLFIND@" config.have_ocamlopt = @HAVE_OCAMLOPT@ config.ocaml_flags = "@OCAMLFLAGS@" config.ptxas_executable = "@PTXAS_EXECUTABLE@" -config.enable_shared = @ENABLE_SHARED@ config.enable_assertions = @ENABLE_ASSERTIONS@ config.targets_to_build = "@TARGETS_TO_BUILD@" config.native_target = "@LLVM_NATIVE_ARCH@" diff --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn index 63eb4f296b6c8..d7d1be5f5bd9b 100644 --- a/llvm/utils/gn/secondary/clang/test/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn @@ -19,7 +19,6 @@ template("write_lit_config") { "CLANG_BINARY_DIR=" + rebase_path(get_label_info("//clang", "target_out_dir"), dir), "CLANG_SOURCE_DIR=" + rebase_path("//clang", dir), - "ENABLE_SHARED=0", "LLVM_BINARY_DIR=" + rebase_path(get_label_info("//llvm", "target_out_dir"), dir), "LLVM_LIBS_DIR=", # needed only for shared builds @@ -61,6 +60,7 @@ write_lit_config("lit_site_cfg") { "CMAKE_CXX_COMPILER=c++", "CMAKE_C_COMPILER=cc", "ENABLE_BACKTRACES=1", + "ENABLE_SHARED=0", "LLVM_ENABLE_ZSTD=0", "LLVM_EXTERNAL_LIT=", "LLVM_HOST_TRIPLE=$llvm_current_triple", diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn index 38729e0f7e19c..03ffe11607040 100644 --- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn @@ -21,7 +21,6 @@ template("write_lit_config") { values = [ "LIT_SITE_CFG_IN_HEADER=" + "## Autogenerated from $input, do not edit\n\n" + lit_path_function, - "ENABLE_SHARED=0", "LLVM_BINARY_DIR=" + rebase_path(get_label_info("//llvm", "target_out_dir"), dir), "LLVM_SOURCE_DIR=" + rebase_path("//llvm", dir), diff --git a/polly/test/Unit/lit.site.cfg.in b/polly/test/Unit/lit.site.cfg.in index 75420db8d30c7..2aeaf197f06cf 100644 --- a/polly/test/Unit/lit.site.cfg.in +++ b/polly/test/Unit/lit.site.cfg.in @@ -9,7 +9,6 @@ config.llvm_libs_dir = lit_config.substitute("@LLVM_LIBS_DIR@") config.llvm_build_mode = lit_config.substitute("@LLVM_BUILD_MODE@") config.polly_obj_root = "@POLLY_BINARY_DIR@" config.polly_lib_dir = "@POLLY_LIB_DIR@" -config.enable_shared = @ENABLE_SHARED@ config.shlibdir = "@SHLIBDIR@" config.target_triple = "@LLVM_TARGET_TRIPLE@" config.enable_gpgpu_codegen = "@GPU_CODEGEN@" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
