[llvm-commits] [hlvm] r38397 - /hlvm/trunk/Makefile

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:02:58 2007
New Revision: 38397

URL: http://llvm.org/viewvc/llvm-project?rev=38397&view=rev
Log:
Add a new variable, MYLLVMGXX, to specify the location of the llvm-gcc and
llvm-gxx programs that HLVM depends on. This option is then used to specify
the with_llvmgcc and with_llvmgxx options to scons.

Modified:
    hlvm/trunk/Makefile

Modified: hlvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/Makefile?rev=38397&r1=38396&r2=38397&view=diff

==============================================================================
--- hlvm/trunk/Makefile (original)
+++ hlvm/trunk/Makefile Sat Jul  7 19:02:58 2007
@@ -18,6 +18,9 @@
 # Specify where you want HLVM to be installed
 MYPREFIX := /proj/install/hlvm
 
+# Specify where the llvm-gcc tools are located
+MYLLVMGCC := /proj/llvm/cfe/install/bin
+
 SCONSOPTS := -Q -j 2
 
 SUITES := normal
@@ -30,19 +33,27 @@
 
 debug Debug:
 	scons $(SCONSOPTS)  mode=Debug debug=1 assertions=1 optimized=0 \
-	inline=0 small=0 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	inline=0 small=0 \
+	confpath=$(MYPATH) prefix=$(MYPREFIX) \
+	with_llvmgcc=$(MYLLVMGCC)/llvm-gcc with_llvmgxx=$(MYLLVMGCC)/llvm-g++
 
 optimized Optimized:
 	scons $(SCONSOPTS)  mode=Optimized debug=0 assertions=1 optimized=1 \
-	inline=1 small=0 strip=0 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	inline=1 small=0 strip=0 \
+	confpath=$(MYPATH) prefix=$(MYPREFIX) \
+	with_llvmgcc=$(MYLLVMGCC)/llvm-gcc with_llvmgxx=$(MYLLVMGCC)/llvm-g++
 
 release Release:
 	scons $(SCONSOPTS) mode=Release debug=0 assertions=0 optimized=1 \
-	inline=1 small=1 strip=1 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	inline=1 small=1 strip=1 \
+	confpath=$(MYPATH) prefix=$(MYPREFIX) \
+	with_llvmgcc=$(MYLLVMGCC)/llvm-gcc with_llvmgxx=$(MYLLVMGCC)/llvm-g++
 
 profile Profile:
 	scons $(SCONSOPTS) mode=Profile debug=0 assertions=0 optimized=1  \
-	inline=1 small=0 strip=0 profile=1 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	inline=1 small=0 strip=0 profile=1 \
+	confpath=$(MYPATH) prefix=$(MYPREFIX) \
+	with_llvmgcc=$(MYLLVMGCC)/llvm-gcc with_llvmgxx=$(MYLLVMGCC)/llvm-g++
 
 check: 
 	scons -Q check mode=$(MYMODE) suites=$(SUITES)