Mercurial > hg > openjdk > hsx20

changeset 1924:a5610f0862fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author dholmes
date Thu, 09 Dec 2010 20:12:06 -0500
parents 09b4dd4f152b
children 7cf1a74771e8
files make/linux/makefiles/build_vm_def.sh make/linux/makefiles/gcc.make
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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