diff options
| author | petede <none@none> | 2005-09-07 15:34:32 -0700 |
|---|---|---|
| committer | petede <none@none> | 2005-09-07 15:34:32 -0700 |
| commit | 35a86aa15b9b2d79753a6e9a27890c7193e60958 (patch) | |
| tree | 9d78591a5fbf6e364b4db8526207d450d5d81984 /usr/src/Makefile.master | |
| parent | f3e0b6b17d0abe14584d5aba004affc269c46dc0 (diff) | |
| download | illumos-gate-35a86aa15b9b2d79753a6e9a27890c7193e60958.tar.gz | |
6316914 changes in ON needed for Vulcan (SunStudio 10) compiler switch
Diffstat (limited to 'usr/src/Makefile.master')
| -rw-r--r-- | usr/src/Makefile.master | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 332fc10eb0..b79d8e2e3f 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -103,11 +103,13 @@ DEF_STRIPFLAG= STRIPFLAG=$(DEF_STRIPFLAG) # set __GNUC= in the environment to build 32-bit with the gcc compiler. +# The default is to use the Sun Studio 10 compiler for all processor types. __GNUC= $(POUND_SIGN) -# set __GNUC64 to '#' in the environment to build 64-bit with the Studio -# compiler. The default is to use gcc for amd64 but not sparcv9. -__GNUC64= $(INTEL_BLD) +# set __GNUC64= in the environment to build 64-bit with the gcc compiler. +# The default is to use the Sun Studio 10 compiler by using the __GNUC +# setting. +__GNUC64= $(__GNUC) # BUILD_TOOLS is the root of all tools including compilers. # ONBLD_TOOLS is the root of all the tools that are part of SUNWonbld. @@ -564,7 +566,7 @@ NATIVE_MACH= $(MACH:amd64=i386) # Defined here so it can be overridden by developer. # SPRO_ROOT= $(BUILD_TOOLS)/SUNWspro -SPRO_VROOT= $(SPRO_ROOT)/SOS8 +SPRO_VROOT= $(SPRO_ROOT)/SOS10 GNU_ROOT= $(SFW_ROOT) # Specify platform compiler versions for languages @@ -607,7 +609,7 @@ $(__GNUC64)amd64_CCC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_g++ amd64_CPP= /usr/ccs/lib/cpp amd64_AS= $(ONBLD_TOOLS)/bin/$(MACH)/aw amd64_LD= /usr/ccs/bin/ld -amd64_LINT= $(SPRO_ROOT)/SOS10-EA/bin/lint +amd64_LINT= $(SPRO_VROOT)/bin/lint NATIVECC= $($(NATIVE_MACH)_CC) NATIVECCC= $($(NATIVE_MACH)_CCC) |