]> git.lizzy.rs Git - rust.git/commitdiff
build: Fix definition of LLC/LLVM_AS
authorBrian Anderson <banderson@mozilla.com>
Wed, 14 Dec 2011 03:03:43 +0000 (19:03 -0800)
committerBrian Anderson <banderson@mozilla.com>
Wed, 14 Dec 2011 03:48:17 +0000 (19:48 -0800)
Using bindir doesn't work on windows anymore. Something to do with us not
actually installing it, but running directly from the build directory, maybe
just an LLVM bug.

Makefile.in

index d36703da1010bb5b70a2600091d2dd477eb71fa6..799bd6e348a77e2768b8a1e3d5e4cef0fc091adc 100644 (file)
@@ -237,8 +237,8 @@ LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags)
 LLVM_CXXFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --cxxflags)
 LLVM_HOST_TRIPLE_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --host-target)
 
-LLVM_AS_$(1)=$$(LLVM_BINDIR_$(1))/llvm-as$$(X)
-LLC_$(1)=$$(LLVM_BINDIR_$(1))/llc$$(X)
+LLVM_AS_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-as$$(X)
+LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X)
 
 endef