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: 4f6f0491a4d8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ebec1d12a3ae
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 3, 2020

  1. llvm: use correct version of tablegen when cross compiling _8 and _9

    @corngood
    corngood committed Jan 3, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6c86a2b View commit details

  2. Merge pull request #76887 from corngood/llvm-cross-fix 

    llvm: use correct version of tablegen when cross compiling _8 and _9
    @Ericson2314
    Ericson2314 authored Jan 3, 2020
    Copy the full SHA
    ebec1d1 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/compilers/llvm/8/llvm.nix
  2. +1 −1 pkgs/development/compilers/llvm/9/llvm.nix
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/8/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ in stdenv.mkDerivation ({
"-DCAN_TARGET_i386=false"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_CROSSCOMPILING=True"
"-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen"
"-DLLVM_TABLEGEN=${buildPackages.llvm_8}/bin/llvm-tblgen"
];

postBuild = ''
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/9/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -126,7 +126,7 @@ in stdenv.mkDerivation (rec {
"-DCAN_TARGET_i386=false"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_CROSSCOMPILING=True"
"-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen"
"-DLLVM_TABLEGEN=${buildPackages.llvm_9}/bin/llvm-tblgen"
];

postBuild = ''