[PATCH] D56805: mac: Correctly disable tools/lto tests when building with LLVM_ENABLE_PIC=OFF
Phabricator via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Jan 17 19:41:22 PST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL351515: mac: Correctly disable tools/lto tests when building with LLVM_ENABLE_PIC=OFF (authored by nico, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D56805?vs=182130&id=182447#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D56805/new/
https://reviews.llvm.org/D56805
Files:
llvm/trunk/test/lit.cfg.py
llvm/trunk/test/lit.site.cfg.py.in
llvm/trunk/utils/gn/secondary/llvm/test/BUILD.gn
Index: llvm/trunk/utils/gn/secondary/llvm/test/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/test/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/test/BUILD.gn
@@ -59,7 +59,6 @@
"LLVM_LINK_LLVM_DYLIB=0",
"LLVM_LIT_TOOLS_DIR=", # Intentionally empty, matches cmake build.
"LLVM_NATIVE_ARCH=$native_target",
- "LLVM_TOOL_LTO_BUILD=1", # The GN build always builds //llvm/tools/lto.
"LLVM_USE_INTEL_JITEVENTS=0",
"LLVM_USE_SANITIZER=",
"PYTHON_EXECUTABLE=$python_path",
Index: llvm/trunk/test/lit.cfg.py
===================================================================
--- llvm/trunk/test/lit.cfg.py
+++ llvm/trunk/test/lit.cfg.py
@@ -278,7 +278,10 @@
def have_ld64_plugin_support():
- if not config.llvm_tool_lto_build or config.ld64_executable == '':
+ if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'libLTO' + config.llvm_shlib_ext)):
+ return False
+
+ if config.ld64_executable == '':
return False
ld_cmd = subprocess.Popen(
Index: llvm/trunk/test/lit.site.cfg.py.in
===================================================================
--- llvm/trunk/test/lit.site.cfg.py.in
+++ llvm/trunk/test/lit.site.cfg.py.in
@@ -15,7 +15,6 @@
config.python_executable = "@PYTHON_EXECUTABLE@"
config.gold_executable = "@GOLD_EXECUTABLE@"
config.ld64_executable = "@LD64_EXECUTABLE@"
-config.llvm_tool_lto_build = @LLVM_TOOL_LTO_BUILD@
config.ocamlfind_executable = "@OCAMLFIND@"
config.have_ocamlopt = @HAVE_OCAMLOPT@
config.have_ocaml_ounit = @HAVE_OCAML_OUNIT@
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56805.182447.patch
Type: text/x-patch
Size: 1614 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190118/6be87421/attachment-0001.bin>
More information about the llvm-commits
mailing list