# HG changeset patch
# User dholmes
# Date 1291943526 18000
# Node ID a5610f0862fe5c66a89db4e3f843599d50a229a4
# Parent  09b4dd4f152b9a1e3856aa453f9cda778ac23b22
7005007: Refine use of ALT_COMPILER_PATH to avoid conflict with JPRT usage
Summary: Check for CROSS_COMPILE_ARCH being set as an indicator to use ALT_COMPILER_PATH
Reviewed-by: acorn, ohair

diff -r 09b4dd4f152b -r a5610f0862fe make/linux/makefiles/build_vm_def.sh
--- a/make/linux/makefiles/build_vm_def.sh	Thu Dec 09 15:04:26 2010 -0500
+++ b/make/linux/makefiles/build_vm_def.sh	Thu Dec 09 20:12:06 2010 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # If we're cross compiling use that path for nm
-if [ "$ALT_COMPILER_PATH" != "" ]; then 
+if [ "$CROSS_COMPILE_ARCH" != "" ]; then 
 NM=$ALT_COMPILER_PATH/nm
 else
 NM=nm
diff -r 09b4dd4f152b -r a5610f0862fe make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make	Thu Dec 09 15:04:26 2010 -0500
+++ b/make/linux/makefiles/gcc.make	Thu Dec 09 20:12:06 2010 -0500
@@ -25,7 +25,9 @@
 #------------------------------------------------------------------------
 # CC, CPP & AS
 
-ifdef ALT_COMPILER_PATH
+# When cross-compiling the ALT_COMPILER_PATH points
+# to the cross-compilation toolset
+ifdef CROSS_COMPILE_ARCH
 CPP = $(ALT_COMPILER_PATH)/g++
 CC  = $(ALT_COMPILER_PATH)/gcc
 else