3 files changed, 17 insertions, 7 deletions
diff --git a/config.mk b/config.mk
index e4f6ebcfb..6e63294db 100644
--- a/config.mk
+++ b/config.mk
@@ -12,9 +12,9 @@ endif
 CUSTOM_LINKER = ${ROOTPATH}/src/build/linker/linker
 TRACEPP = ${ROOTPATH}/src/build/trace/tracepp
 
-CC = ${TRACEPP} ppc64-linux-gcc
-CXX = ${TRACEPP} ppc64-linux-g++
-LD = ppc64-linux-ld
+CC = ${TRACEPP} ppc64-mcp6-gcc
+CXX = ${TRACEPP} ppc64-mcp6-g++
+LD = ppc64-mcp6-ld
 
 COMMONFLAGS = -O3 -nostdlib ${EXTRACOMMONFLAGS}
 CFLAGS = ${COMMONFLAGS} -mcpu=power7 -nostdinc -g -msoft-float -mno-altivec \
diff --git a/env.bash b/env.bash
index a12aeb554..28dcf56e4 100644
--- a/env.bash
+++ b/env.bash
@@ -1,2 +1,7 @@
-export LD_LIBRARY_PATH=/esw/fakeroot/usr/lib/
-export PATH=${PATH}:/esw/fakeroot/opt/mcp/ppc64/bin:`pwd`/src/build/trace
+export MCP_PATH=/esw/user/nfs/iawillia/fakeroot
+
+if [ -e /esw/fakeroot/ ]; then
+    export MCP_PATH=/esw/fakeroot
+fi
+
+export PATH=${PATH}:${MCP_PATH}/opt/mcp/bin:${MCP_PATH}/usr/bin:`pwd`/src/build/trace
diff --git a/env.csh b/env.csh
index a85139110..61ecc71eb 100644
--- a/env.csh
+++ b/env.csh
@@ -1,2 +1,7 @@
-setenv LD_LIBRARY_PATH /esw/fakeroot/usr/lib/
-setenv PATH ${PATH}:/esw/fakeroot/opt/mcp/ppc64/bin:`pwd`/src/build/trace
+setenv MCP_PATH /esw/user/nfs/iawillia/fakeroot
+if (-e /esw/fakeroot/) then
+    setenv MCP_PATH /esw/fakeroot
+endif
+
+
+setenv PATH ${PATH}:${MCP_PATH}/opt/mcp/bin:${MCP_PATH}/usr/bin:`pwd`/src/build/trace