diff options
| -rw-r--r-- | usr/src/Makefile.master | 10 | ||||
| -rw-r--r-- | usr/src/Makefile.master.64 | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index f4260fd41e..2b5312144d 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -28,7 +28,7 @@ # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. -# Copyright 2020 Joyent, Inc. +# Copyright 2021 Joyent, Inc. # Copyright 2019 RackTop Systems. # Copyright 2020 Oxide Computer Company # Copyright 2020 Peter Tribble @@ -709,6 +709,14 @@ NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ NATIVE_CCFLAGS= $(CCOPTFLAG) $($(NATIVE_MACH)_CCFLAGS) $(CCSOURCEDEBUGFLAGS) \ $(CCUSERFLAGS) +NATIVE_CFLAGS64= $(COPTFLAG64) $($(NATIVE_MACH64)_CFLAGS) $(CCMODE64) \ + $(ILDOFF) $(CERRWARN) $(CSTD) $($(NATIVE_MACH64)_CCUNBOUND) \ + $(IROPTFLAG64) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \ + $(CCNOREORDER) $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS64) + +NATIVE_CCFLAGS64= $(CCOPTFLAG64) $($(NATIVE_MACH64)_CCFLAGS) \ + $(CCSOURCEDEBUGFLAGS) $(CCUSERFLAGS64) + DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\" # For messaging. DTS_ERRNO=-D_TS_ERRNO CPPFLAGS.first= # Please keep empty. Only lower makefiles should set this. diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index c0db926f93..8cd12e5899 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -22,6 +22,7 @@ # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2016 RackTop Systems. +# Copyright 2021 Joyent, Inc. # # rebind basic build macros to 64-bit versions @@ -38,6 +39,8 @@ COMPILE.b= $(COMPILE64.b) LINK.c= $(LINK64.c) LINK.cc= $(LINK64.cc) LINT.c= $(LINT64.c) +NATIVE_CFLAGS= $(NATIVE_CFLAGS64) +NATIVE_CCFLAGS= $(NATIVE_CCFLAGS64) CTF_FLAGS= $(CTF_FLAGS_64) @@ -63,6 +66,11 @@ CPP= $(CPP64) AS= $(AS64) LD= $(LD64) LINT= $(LINT64) +NATIVECC= $(NATIVECC64) +NATIVECCC= $(NATIVECCC64) +NATIVECPP= $(NATIVECPP64) +NATIVEAS= $(NATIVEAS64) +NATIVELD= $(NATIVELD64) BUILD.SO= $(BUILD64.SO) BUILDCCC.SO= $(BUILDCCC64.SO) |