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

Merge #110571: treewide: migrate to -fno-common

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2022-07-07 10:06:38 +02:00
commit 43f9c191bf
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
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) [ ++ lib.optionals (langD) [
"--with-target-system-zlib=yes" "--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 in configureFlags

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

@ -50,18 +50,6 @@ let
./purity.patch ./purity.patch
# https://reviews.llvm.org/D51899 # https://reviews.llvm.org/D51899
./gnu-install-dirs.patch ./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 { (substituteAll {
src = ../../clang-11-12-LLVMgold-path.patch; src = ../../clang-11-12-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib"; libllvmLibdir = "${libllvm.lib}/lib";