about summary refs log tree commit diff
path: root/src/test/run-make/execution-engine
diff options
context:
space:
mode:
authorRichard Diamond <wichard@vitalitystudios.com>2015-08-21 23:43:56 -0500
committerRichard Diamond <wichard@vitalitystudios.com>2015-12-13 15:05:43 -0600
commit7bd69f2248ce2635f3fc05f08d8a7944eed0016a (patch)
treeec6802421b3754c37226742c734fe365dc25076a /src/test/run-make/execution-engine
parent83eda080373285d3cbe4ca0ee280e4844c6422a3 (diff)
downloadrust-7bd69f2248ce2635f3fc05f08d8a7944eed0016a.tar.gz
rust-7bd69f2248ce2635f3fc05f08d8a7944eed0016a.zip
Better support for `--llvm-root`.
This handles cases when the LLVM used isn't configured will the 'usual'
targets. Also, cases where LLVM is shared are also handled (ie with
`LD_LIBRARY_PATH` etc).
Diffstat (limited to 'src/test/run-make/execution-engine')
-rw-r--r--src/test/run-make/execution-engine/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/run-make/execution-engine/Makefile b/src/test/run-make/execution-engine/Makefile
index ef646c5bf5d..4c818cd99e2 100644
--- a/src/test/run-make/execution-engine/Makefile
+++ b/src/test/run-make/execution-engine/Makefile
@@ -4,6 +4,8 @@
 # This is a basic test of LLVM ExecutionEngine functionality using compiled
 # Rust code built using the `rustc` crate.
 
+ifeq ($(filter executionengine,$(LLVM_COMPONENTS)),executionengine)
+
 ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) test.rs
@@ -12,3 +14,8 @@ else
 all:
 
 endif
+
+else
+all:
+
+endif