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++