diff options
Diffstat (limited to 'usr/src/Makefile.master')
| -rw-r--r-- | usr/src/Makefile.master | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 67d57a47c8..253211f50c 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -167,6 +167,7 @@ JAVADOC= $(JAVA_ROOT)/bin/javadoc RMIC= $(JAVA_ROOT)/bin/rmic JAR= $(JAVA_ROOT)/bin/jar CTFCONVERT= $(ONBLD_TOOLS)/bin/$(MACH)/ctfconvert +CTFDIFF= $(ONBLD_TOOLS)/bin/$(MACH)/ctfdiff CTFMERGE= $(ONBLD_TOOLS)/bin/$(MACH)/ctfmerge CTFSTABS= $(ONBLD_TOOLS)/bin/$(MACH)/ctfstabs CTFSTRIP= $(ONBLD_TOOLS)/bin/$(MACH)/ctfstrip @@ -175,8 +176,8 @@ GENOFFSETS= $(ONBLD_TOOLS)/bin/genoffsets XREF= $(ONBLD_TOOLS)/bin/xref FIND= /usr/bin/find PERL= /usr/bin/perl -PERL_VERSION= 5.10.0 -PERL_PKGVERS= -510 +PERL_VERSION= 5.12 +PERL_PKGVERS= -512 PERL_ARCH = i86pc-solaris-64int $(SPARC_BLD)PERL_ARCH = sun4-solaris-64int PYTHON_VERSION= 2.7 @@ -249,7 +250,8 @@ INS.symlink= $(RM) $@; $(SYMLINK) $(INSLINKTARGET) $@ # rebuilds if the baked-in mtime != the mtime of the source file # (rather than only if it's less than), thus when installing python # files we must make certain to not adjust the mtime of the source -# (.py) file. +# (.py) file. As a part of this we also go through and change the #! +# line in the python script to that of the actual python we are using. # INS.pyfile= $(RM) $@; $(SED) -e "1s:^\#!@PYTHON@:\#!$(PYTHON):" < $< > $@; $(CHMOD) $(FILEMODE) $@; $(TOUCH) -r $< $@ @@ -431,9 +433,17 @@ sparcv9_COPTFLAG= -xO3 i386_COPTFLAG= -O amd64_COPTFLAG= -xO3 +# This would normally be added by cw(1) but cannot be while we want to support +# Both GCC 3.x and GCC 4.x +$(__GNUC4)$(MACH)_COPTFLAG += -_gcc=-fno-inline-small-functions \ + -_gcc=-fno-inline-functions-called-once +$(__GNUC4)$(MACH64)_COPTFLAG += -_gcc=-fno-inline-small-functions \ + -_gcc=-fno-inline-functions-called-once + COPTFLAG= $($(MACH)_COPTFLAG) COPTFLAG64= $($(MACH64)_COPTFLAG) + # When -g is used, the compiler globalizes static objects # (gives them a unique prefix). Disable that. CNOGLOBAL= -W0,-noglobal @@ -565,8 +575,7 @@ CPPFLAGS.first= # Please keep empty. Only lower makefiles should set this. CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \ $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \ $(ADJUNCT_PROTO:%=-I%/usr/include) -CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \ - $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include +CPPFLAGS.native=-I$(NATIVE_ADJUNCT)/include CPPFLAGS= $(CPPFLAGS.first) $(CPPFLAGS.master) AS_CPPFLAGS= $(CPPFLAGS.first) $(CPPFLAGS.master) JAVAFLAGS= -source 1.6 -target 1.6 -Xlint:deprecation,-options @@ -918,6 +927,14 @@ CTFCVTFLAGS= -i -L VERSION # CTFMRGFLAGS= +# +# Make the transition between old and new CTF Tools. The new ctf tools +# do not support stabs (eg. Sun Studio), so if GNUC is not set, we don't +# honor them. +# +$(__GNUC)CTFCONVERT= $(ONBLD_TOOLS)/bin/$(MACH)/ctfconvert-altexec +$(__GNUC)CTFMERGE= $(ONBLD_TOOLS)/bin/$(MACH)/ctfmerge-altexec + CTFCONVERT_O = $(CTFCONVERT) $(CTFCVTFLAGS) $@ # Rules (normally from make.rules) and macros which are used for post |