From: Chris Lattner <sabre@nondot.org>
Date: Wed, 18 Sep 2002 19:32:17 +0000 (+0000)
Subject: Change Makefile.config to support building on the group's linux machines
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66c1ab8d766d9632f955de3ea8b5c4dd5573e121;p=oota-llvm.git

Change Makefile.config to support building on the group's linux machines


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3814 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/Makefile.config b/Makefile.config
index f4def414305..1660b5a5eb2 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -10,8 +10,8 @@
 # Set LLVM_OBJ_DIR to "." if you do not want to use a separate place for
 # object files.
 # 
-# LLVM_OBJ_DIR = .
-LLVM_OBJ_DIR = /shared/$(shell whoami)
+#LLVM_OBJ_DIR = .
+LLVM_OBJ_DIR = /localhome/$(shell whoami)
 
 # Path to executable for Burg
 # 
@@ -24,3 +24,10 @@ PURIFY = /usr/dcs/applications/purify/bin/purify
 # Path to location for LLVM front-end
 # 
 LLVMGCCDIR = /home/vadve/lattner/cvs/gcc_install
+
+# Path to the C++ compiler to use.  Under linux, for some reason the compiler
+# driver wants to search the PATH to find the system assembler, which breaks if
+# the LLVM assembler is in our path.  Hack it to use the assembler in /usr/bin
+# directly.
+#
+CXX = PATH=/usr/bin /usr/dcs/software/evaluation/bin/g++