JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc, clang11: don't force -fcommon on GCC 10 or clang11

Browse Source 
GCC 10 sets -fno-common by default. This broke some packages, so
when moving to GCC 10 we initially disabled this behavior. This
commit reverts that, bringing us closer to the standard and
upstream.

Co-authored-by: Sergei Trofimovich <slyich@gmail.com>
This commit is contained in:
Gaelan Steele 2021-01-19 18:18:01 -08:00 committed by Sergei Trofimovich
parent e120ef6a5a
commit 5b47eb13ac
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/gcc/common/configure-flags.nix
View File

@ -222,9 +222,6 @@ let
++ lib.optionals (langD) [
"--with-target-system-zlib=yes"
]
# Make -fcommon default on gcc10
# TODO: fix all packages (probably 100+) and remove that
++ lib.optional (version >= "10.1.0") "--with-specs=%{!fno-common:%{!fcommon:-fcommon}}"
;
in configureFlags

12
pkgs/development/compilers/llvm/11/clang/default.nix
View File

@ -50,18 +50,6 @@ let
./purity.patch
# https://reviews.llvm.org/D51899
./gnu-install-dirs.patch
# Revert: [Driver] Default to -fno-common for all targets
# https://reviews.llvm.org/D75056
#
# Maintains compatibility with packages that haven't been fixed yet, and
# matches gcc10's configuration in nixpkgs.
(fetchpatch {
revert = true;
url = "https://github.com/llvm/llvm-project/commit/0a9fc9233e172601e26381810d093e02ef410f65.diff";
stripLen = 1;
excludes = [ "docs/*" "test/*" ];
sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph";
})
(substituteAll {
src = ../../clang-11-12-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";