# HG changeset patch
# User Lauri Tirkkonen <lotheac@iki.fi>
# Date 1557612474 0
# Node ID 1ceaf000b6c668db3fd154e5a1a90f2cb976ff5c
# Parent  22e10b9a408d8af4d4d7bba4be133ce0192ad3b5
Makefile.master: don't use -nodefaultlibs for c++

libstdc++ needs some libgcc symbols, and libgcc.a is in a pretty weird path
since we don't have libgcc_s.so any more. just allow default libs for c++, we
are linking against system-installed libstdc++ anyway.

diff -r 22e10b9a408d -r 1ceaf000b6c6 usr/src/Makefile.master
--- a/usr/src/Makefile.master	Sat May 11 21:57:31 2019 +0000
+++ b/usr/src/Makefile.master	Sat May 11 22:07:54 2019 +0000
@@ -573,8 +573,7 @@
 		-fno-inline-functions \
 		-fno-builtin \
 		-fno-asm \
-		-fdiagnostics-show-option \
-		-nodefaultlibs
+		-fdiagnostics-show-option
 
 # The SPARC ldd and std instructions require 8-byte alignment of their
 # address operand.  gcc correctly uses them only when the ABI requires
@@ -607,13 +606,13 @@
 sparcv9_AS=		/usr/bin/as -xregsym=no
 sparcv9_LD=		/usr/bin/ld
 
-i386_CC=		/usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS)
+i386_CC=		/usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) -nodefaultlibs
 i386_CCC=		/usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS)
 i386_CPP=		$(GNUC_ROOT)/bin/cpp
 i386_AS=		$(GNUC_ROOT)/bin/gcc $(BASIC_AS_ARGS)
 i386_LD=		/usr/bin/ld
 
-amd64_CC=		/usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS)
+amd64_CC=		/usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) -nodefaultlibs
 amd64_CCC=		/usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS)
 amd64_CPP=		$(GNUC_ROOT)/bin/cpp
 amd64_AS=		$(GNUC_ROOT)/bin/gcc $(BASIC_AS_ARGS)