Print this page
12334 fix gcc4 build
12322 kdb: removal of unused dependency recommended
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
*** 26,36 ****
# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2015 Gary Mills
# Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
# Copyright 2016 Toomas Soome <tsoome@me.com>
# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
! # Copyright 2019, Joyent, Inc.
# Copyright 2019 RackTop Systems.
#
#
# Makefile.master, global definitions for system source
--- 26,36 ----
# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2015 Gary Mills
# 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 2019 RackTop Systems.
#
#
# Makefile.master, global definitions for system source
*** 811,826 ****
--- 811,830 ----
#
# Link time macros
#
CCNEEDED = -lC
CCEXTNEEDED = -lCrun -lCstd
+ NATIVECCNEEDED = -lC
$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
$(__GNUC)CCEXTNEEDED = $(CCNEEDED)
+ $(__GNUC)NATIVECCNEEDED = -R$(GCCLIBDIR) -L$(GCCLIBDIR) -lstdc++ -lgcc_s
CCNEEDED64 = -lCrun
CCEXTNEEDED64 = -lCrun -lCstd
+ NATIVECCNEEDED64 = -lCrun
$(__GNUC64)CCNEEDED64 = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
+ $(__GNUC64)NATIVECCNEEDED64 = -R$(GCCLIBDIR) -L$(GCCLIBDIR) -lstdc++ -lgcc_s
$(__GNUC64)CCEXTNEEDED = $(CCNEEDED64)
# Libraries we expect to use natively on the build machine
NATIVE_LIBS=