diff options
Diffstat (limited to 'usr/src/Makefile.master')
| -rw-r--r-- | usr/src/Makefile.master | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 635215f56a..a6e04e2229 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -27,6 +27,7 @@ # Copyright 2015 Gary Mills # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> +# Copyright 2017 Joyent, Inc. # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # Copyright 2019, Joyent, Inc. # Copyright 2019 RackTop Systems. @@ -49,6 +50,12 @@ ADJUNCT_PROTO= NATIVE_ADJUNCT= /usr # +# Compatibility code for FreeBSD etc. +# +COMPAT= $(SRC)/compat +CONTRIB= $(SRC)/../contrib + +# # RELEASE_BUILD should be cleared for final release builds. # NOT_RELEASE_BUILD is exactly what the name implies. # @@ -192,8 +199,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_MACH= i86pc $(SPARC_BLD)PERL_MACH= sun4 PERL_VARIANT= @@ -290,7 +297,8 @@ $(BUILDPY2)PYSHEBANG= $(PYTHON) # 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@:\#!$(PYSHEBANG):" \ @@ -516,9 +524,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 @@ -660,8 +676,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 |