Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d4ad868aaa4c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f14a4d60b746
Choose a head ref
  • 1 commit
  • 9 files changed
  • 1 contributor

Commits on Jan 28, 2020

  1. Revert "clang_7,clang_8,clang_9: fix compilation of HIP-code" 

    This reverts commit 558af6f.

This was meant for staging. Will apply there.
    @matthewbauer
    matthewbauer committed Jan 28, 2020
    Copy the full SHA
    f14a4d6 View commit details
68 changes: 0 additions & 68 deletions pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
View file

This file was deleted.

10 changes: 3 additions & 7 deletions pkgs/development/compilers/llvm/7/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;

buildInputs = [ libxml2 llvm lld ]
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

cmakeFlags = [
@@ -38,11 +38,7 @@ let
"-DLINK_POLLY_INTO_TOOLS=ON"
];

patches = [
./purity.patch
# make clang -xhip use $PATH to find executables
./HIP-use-PATH-7.patch
];
patches = [ ./purity.patch ];

postPatch = ''
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
1 change: 0 additions & 1 deletion pkgs/development/compilers/llvm/7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ let
llvm-polly = callPackage ./llvm.nix { enablePolly = true; };

clang-unwrapped = callPackage ./clang {
inherit (tools) lld;
inherit clang-tools-extra_src;
};
clang-polly-unwrapped = callPackage ./clang {
80 changes: 0 additions & 80 deletions pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
View file

This file was deleted.

6 changes: 2 additions & 4 deletions pkgs/development/compilers/llvm/8/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;

buildInputs = [ libxml2 llvm lld ]
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

cmakeFlags = [
@@ -50,8 +50,6 @@ let
./unwindlib.patch
# https://reviews.llvm.org/D51899
./compiler-rt-baremetal.patch
# make clang -xhip use $PATH to find executables
./HIP-use-PATH-8.patch
];

postPatch = ''
1 change: 0 additions & 1 deletion pkgs/development/compilers/llvm/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ let
llvm-polly = callPackage ./llvm.nix { enablePolly = true; };

clang-unwrapped = callPackage ./clang {
inherit (tools) lld;
inherit clang-tools-extra_src;
};
clang-polly-unwrapped = callPackage ./clang {
80 changes: 0 additions & 80 deletions pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch
View file

This file was deleted.

6 changes: 2 additions & 4 deletions pkgs/development/compilers/llvm/9/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;

buildInputs = [ libxml2 llvm lld ]
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

cmakeFlags = [
@@ -43,8 +43,6 @@ let
./purity.patch
# https://reviews.llvm.org/D51899
./compiler-rt-baremetal.patch
# make clang -xhip use $PATH to find executables
./HIP-use-PATH-9.patch
];

postPatch = ''
1 change: 0 additions & 1 deletion pkgs/development/compilers/llvm/9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ let
llvm-polly = callPackage ./llvm.nix { enablePolly = true; };

clang-unwrapped = callPackage ./clang {
inherit (tools) lld;
inherit clang-tools-extra_src;
};
clang-polly-unwrapped = callPackage ./clang {