diff options
| author | Toomas Soome <tsoome@me.com> | 2019-08-09 09:57:22 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-08-21 08:49:13 +0300 |
| commit | a99cb9618990662acbd3bab1b4a5b05a6ca62556 (patch) | |
| tree | eb4d3678206a9afc092b764f0380c8e878b3e39c | |
| parent | 7e6ac63905653744ac6703d7bc31790c363cf5e7 (diff) | |
| download | illumos-joyent-a99cb9618990662acbd3bab1b4a5b05a6ca62556.tar.gz | |
11531 tools/make should set NATIVE_CCFLAGS
Reviewed by: Aurélien Larcher <aurelien.larcher@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/Makefile.master | 7 | ||||
| -rw-r--r-- | usr/src/tools/make/Makefile.com | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 11a7d6334f..23ff2610ae 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -637,6 +637,9 @@ NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ $(IROPTFLAG) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \ $(CCNOREORDER) $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS) +NATIVE_CCFLAGS= $(CCOPTFLAG) $($(NATIVE_MACH)_CCFLAGS) $(CCSOURCEDEBUGFLAGS) \ + $(CCUSERFLAGS) + DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\" # For messaging. DTS_ERRNO=-D_TS_ERRNO CPPFLAGS.first= # Please keep empty. Only lower makefiles should set this. @@ -676,7 +679,7 @@ BUILD.po= $(XGETTEXT) $(XGETFLAGS) -d $(<F) $<.i ;\ # POFILE= $(PROG).po -sparc_CCFLAGS= -cg92 -compat=4 \ +sparc_CCFLAGS= $(sparc_XARCH) -cg92 -compat=4 \ -Qoption ccfe -messages=no%anachronism \ $(CCERRWARN) sparcv9_CCFLAGS= $(sparcv9_XARCH) -dalign -compat=5 \ @@ -684,7 +687,7 @@ sparcv9_CCFLAGS= $(sparcv9_XARCH) -dalign -compat=5 \ -Qoption ccfe -features=no%conststrings \ $(CCCREGSYM) \ $(CCERRWARN) -i386_CCFLAGS= -compat=4 \ +i386_CCFLAGS= $(i386_XARCH) -compat=4 \ -Qoption ccfe -messages=no%anachronism \ -Qoption ccfe -features=no%conststrings \ $(CCERRWARN) diff --git a/usr/src/tools/make/Makefile.com b/usr/src/tools/make/Makefile.com index 05ff964cd4..97c32780bf 100644 --- a/usr/src/tools/make/Makefile.com +++ b/usr/src/tools/make/Makefile.com @@ -17,4 +17,5 @@ CC = $(NATIVECC) CCC = $(NATIVECCC) CFLAGS = $(NATIVE_CFLAGS) CFLAGS += $(CCVERBOSE) +CCFLAGS = $(NATIVE_CCFLAGS) CPPFLAGS = -I$(MAKE_INCLUDE) $(MAKE_DEFS) |