1.1 --- a/make/common/shared/Defs-solaris.gmk Fri Aug 13 11:38:10 2010 -0700
1.2 +++ b/make/common/shared/Defs-solaris.gmk Mon Aug 30 14:39:42 2010 -0700
1.3 @@ -86,24 +86,6 @@
1.4 JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
1.5 endif
1.6
1.7 -# COMPILER_PATH: path to where the compiler and tools are installed.
1.8 -# NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.9 -ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
1.10 - COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
1.11 -else
1.12 - # Careful here, COMPILER_VERSION may not be defined yet (see Compiler.gmk)
1.13 - # If the place where we keep a set of Sun Studio compilers doesn't exist,
1.14 - # try and use /opt/SUNWspro, the default location for the SS compilers.
1.15 - # (DirExists checks for this path twice, an automount double check)
1.16 - _SUNSTUDIO_SET_ROOT=$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/SUNWspro
1.17 - SUNSTUDIO_SET_ROOT:=$(call DirExists,$(_SUNSTUDIO_SET_ROOT),$(_SUNSTUDIO_SET_ROOT),)
1.18 - ifneq ($(SUNSTUDIO_SET_ROOT),)
1.19 - COMPILER_PATH =$(SUNSTUDIO_SET_ROOT)/$(COMPILER_VERSION)/bin/
1.20 - else
1.21 - COMPILER_PATH =/opt/SUNWspro/bin/
1.22 - endif
1.23 -endif
1.24 -
1.25 # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
1.26 # NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.27 ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
