pyrox.dev / nixpkgs
lol
fork atom

clang_13,clang_14,clang_git: deduplicate patch

The same patch applies to all Clang versions using it.

Alyssa Ross eb2eafd2 de3f71e2

+3 -39
unified split
-18
pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch
··· 1 - diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp 2 - index 94a7553e273b..8a1d455950b2 100644 3 - --- a/lib/Driver/Driver.cpp 4 - +++ b/lib/Driver/Driver.cpp 5 - @@ -412,6 +412,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { 6 - } 7 - #endif 8 - 9 - + { 10 - + Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr, 11 - + Opts.getOption(options::OPT_nostdlibinc)); 12 - + A->claim(); 13 - + DAL->append(A); 14 - + } 15 - + 16 - return DAL; 17 - } 18 -
+1 -1
pkgs/development/compilers/llvm/13/clang/default.nix
··· 42 42 # mis-compilation in firefox. 43 43 # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 44 44 ./revert-malloc-alignment-assumption.patch 45 - ./add-nostdlibinc-flag.patch 45 + ../../common/clang/add-nostdlibinc-flag.patch 46 46 (substituteAll { 47 47 src = ../../clang-11-12-LLVMgold-path.patch; 48 48 libllvmLibdir = "${libllvm.lib}/lib";
-18
pkgs/development/compilers/llvm/14/clang/add-nostdlibinc-flag.patch
··· 1 - diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp 2 - index 3bfddeefc7b2..05b11d9e562d 100644 3 - --- a/lib/Driver/Driver.cpp 4 - +++ b/lib/Driver/Driver.cpp 5 - @@ -482,6 +482,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { 6 - } 7 - #endif 8 - 9 - + { 10 - + Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr, 11 - + Opts.getOption(options::OPT_nostdlibinc)); 12 - + A->claim(); 13 - + DAL->append(A); 14 - + } 15 - + 16 - return DAL; 17 - } 18 -
+1 -1
pkgs/development/compilers/llvm/14/clang/default.nix
··· 45 45 ./purity.patch 46 46 # https://reviews.llvm.org/D51899 47 47 ./gnu-install-dirs.patch 48 - ./add-nostdlibinc-flag.patch 48 + ../../common/clang/add-nostdlibinc-flag.patch 49 49 (substituteAll { 50 50 src = ../../clang-11-12-LLVMgold-path.patch; 51 51 libllvmLibdir = "${libllvm.lib}/lib";
pkgs/development/compilers/llvm/git/clang/add-nostdlibinc-flag.patch pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch
+1 -1
pkgs/development/compilers/llvm/git/clang/default.nix
··· 46 46 ./purity.patch 47 47 # https://reviews.llvm.org/D51899 48 48 ./gnu-install-dirs.patch 49 - ./add-nostdlibinc-flag.patch 49 + ../../common/clang/add-nostdlibinc-flag.patch 50 50 (substituteAll { 51 51 src = ../../clang-11-12-LLVMgold-path.patch; 52 52 libllvmLibdir = "${libllvm.lib}/lib";