[dragonegg] r197742 - Take LLVM_TOOLS_DIR from not based on --obj-root, but from --bindir directly. "llvm-config --bindir" knows appropriate prefix.

NAKAMURA Takumi geek4civic at gmail.com
Thu Dec 19 15:10:28 PST 2013


Author: chapuni
Date: Thu Dec 19 17:10:28 2013
New Revision: 197742

URL: http://llvm.org/viewvc/llvm-project?rev=197742&view=rev
Log:
Take LLVM_TOOLS_DIR from not based on --obj-root, but from --bindir directly. "llvm-config --bindir" knows appropriate prefix.

It's followup since llvm r197684.

Modified:
    dragonegg/trunk/Makefile

Modified: dragonegg/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/Makefile?rev=197742&r1=197741&r2=197742&view=diff
==============================================================================
--- dragonegg/trunk/Makefile (original)
+++ dragonegg/trunk/Makefile Thu Dec 19 17:10:28 2013
@@ -26,8 +26,7 @@ TOP_DIR?=$(CURDIR)
 # Where to find the lit.py script and modules, used for running tests.
 LIT_DIR?=$(shell $(LLVM_CONFIG) --src-root)/utils/lit
 # Where to find LLVM utils, used for running tests.
-LLVM_TOOLS_DIR?=$(shell $(LLVM_CONFIG) --obj-root)/bin:$(shell $(LLVM_CONFIG) \
-	--obj-root)/$(shell $(LLVM_CONFIG) --build-mode)/bin/
+LLVM_TOOLS_DIR?=$(shell $(LLVM_CONFIG) --bindir)
 
 INCLUDE_DIR=$(TOP_DIR)/include
 SRC_DIR=$(TOP_DIR)/src





More information about the llvm-commits mailing list