about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-06 05:05:59 -0700
committerbors <bors@rust-lang.org>2013-09-06 05:05:59 -0700
commitd39cec65b025ad4c6de50e778ffd1177279b5b3d (patch)
treed245950e0e509a236538b4c7e0d6fd18da56febb
parent9298af7e05b5eea00fff5c4dc4b55931a6f7c433 (diff)
parentd4ebe835b265bdc255773bc5598d7d1fae9591f2 (diff)
downloadrust-d39cec65b025ad4c6de50e778ffd1177279b5b3d.tar.gz
rust-d39cec65b025ad4c6de50e778ffd1177279b5b3d.zip
auto merge of #9017 : vadimcn/rust/rustllvm-build, r=alexcrichton
After recent build directory reorg, building from scratch fails (at least on Windows), because it can't find llvm-config.h.
-rw-r--r--mk/rustllvm.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/rustllvm.mk b/mk/rustllvm.mk
index 8c3bf4e05b9..b543926a4f3 100644
--- a/mk/rustllvm.mk
+++ b/mk/rustllvm.mk
@@ -19,7 +19,7 @@ define DEF_RUSTLLVM_TARGETS
 # llvm, but using it straight out of the build directory)
 ifdef CFG_WINDOWSY_$(1)
 LLVM_EXTRA_INCDIRS_$(1)= -iquote $(S)src/llvm/include \
-                         -iquote llvm/$(1)/include
+                         -iquote $$(CFG_LLVM_BUILD_DIR_$(1))/include
 endif
 
 RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp PassWrapper.cpp)