X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.config;h=c16e16774f0cc6182757f5426f606fa051af8e46;hb=87944916a4764dabc2f89cbec0a6c7e439c28530;hp=d94552f110d39faff4d0ce6762cca99be426f509;hpb=bf587f324492084df0ba65cb0fc20074c841b6f6;p=oota-llvm.git

diff --git a/Makefile.config b/Makefile.config
index d94552f110d..c16e16774f0 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -4,23 +4,34 @@
 # values specific to a particular installation of LLVM.
 #===-----------------------------------------------------------------------====
 
-# Current working directory, used below
+# Path to the C++ compiler to use.  This is an optional setting, which defaults
+# to whatever your gmake defaults to.
+#
+# 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++
+
+# We have the same problem with the CC binary, which use used by testcases for
+# native builds.
+#
+CC := PATH=/usr/bin /usr/dcs/software/evaluation/bin/gcc
 
 # Path to directory where object files should be stored during a build.
 # 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/$(USER)
 
-# Path to executable for Burg
-# 
-BURG = /home/vadve/vadve/Research/DynOpt/Burg/burg
+# Path to location for LLVM front-end this should only be specified here if you
+# want to override the value set in Makefile.$(uname)
+#
+#LLVMGCCDIR := /home/vadve/lattner/cvs/gcc_install_x86
 
-# Path to location for purify
+# Path to location for purify, this is only needed if you build with
+# ENABLE_PURIFY=1
 # 
 PURIFY = /usr/dcs/applications/purify/bin/purify
 
-# Path to location for LLVM front-end
-# 
-LLVMGCCDIR = /home/vadve/lattner/cvs/gcc_install