diff options
Diffstat (limited to 'usr/src/Makefile.master.64')
| -rw-r--r-- | usr/src/Makefile.master.64 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index c629264..4974b1d 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -20,7 +20,7 @@ # # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2011 Nexenta Systems, Inc. All rights reserved. +# Copyright 2014 Garrett D'Amore <garrett@damore.org> # # rebind basic build macros to 64-bit versions @@ -38,6 +38,8 @@ LINK.c= $(LINK64.c) LINK.cc= $(LINK64.cc) LINT.c= $(LINT64.c) +CTF_FLAGS= $(CTF_FLAGS_64) + OFFSETS_CREATE= $(OFFSETS_CREATE64) # @@ -48,6 +50,7 @@ LDLIBS1= $(ENVLDLIBS1:%=%/$(MACH64)) LDLIBS2= $(ENVLDLIBS2:%=%/$(MACH64)) LDLIBS3= $(ENVLDLIBS3:%=%/$(MACH64)) LDLIBS64 = $(LDLIBS1) $(LDLIBS2) $(LDLIBS3) + # # Moved these up to the top level here, so they can be overridden # @@ -55,9 +58,10 @@ LDLIBS.cmd = $(LDLIBS64) LDLIBS.lib = $(LDLIBS64) # -# Override Makefile.master's settings of SFWLIBDIR +# Override Makefile.master's settings of SFWLIBDIR and GCCLIBDIR # SFWLIBDIR= $(SFWLIBDIR64) +GCCLIBDIR= $(GCCLIBDIR64) # # Override Makefile.master's settings of CC, CCC, AS and LINT @@ -81,8 +85,8 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ MAPFILECLASS= -64 CCNEEDED = -lCrun -$(__GNUC64)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ \ - -lgcc_s_$(MACH64) +$(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ +$(__GNUC64)CCNEEDED += -lgcc_s BUILDCCC.SO= $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ $(PICS) $(EXTPICS) $(LDLIBS) $(CCNEEDED) |