diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-04-10 14:01:07 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-04-10 14:01:07 +0000 |
| commit | 879ce458f4076949632380ea11eb304c521d60c4 (patch) | |
| tree | 8b19c64c6f005b76a2b61aec20a38d8c6753323a | |
| parent | 73129d4797117a0cf410f4d55712d61df2a52bca (diff) | |
| download | src-test2-879ce458f4076949632380ea11eb304c521d60c4.tar.gz src-test2-879ce458f4076949632380ea11eb304c521d60c4.zip | |
Notes
| -rw-r--r-- | gnu/usr.bin/gdb/Makefile.inc | 2 | ||||
| -rw-r--r-- | share/mk/src.sys.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc index 097975de3128..30d677726a00 100644 --- a/gnu/usr.bin/gdb/Makefile.inc +++ b/gnu/usr.bin/gdb/Makefile.inc @@ -50,7 +50,7 @@ CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit # Some bits here currently rely on some of the linker-merging magic that happens # with -fcommon. While this is the default right now, explicitly set -fcommon # so that it continues to build when the default flips. -CFLAGS+= -fcommon +CFCOMMONFLAG= -fcommon GENSRCS+= nm.h tm.h diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index addc115b8ab9..61c51f200d35 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -37,7 +37,8 @@ __postrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno # The following should be removed no earlier than LLVM11 being imported into the # tree, to ensure we don't regress the build. LLVM11 and GCC10 will switch the # default over to -fno-common, making this redundant. -CFLAGS+= -fno-common +CFCOMMONFLAG?= -fno-common +CFLAGS+= ${CFCOMMONFLAG} # tempting, but bsd.compiler.mk causes problems this early # probably need to remove dependence on bsd.own.mk |