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

Commits on Jun 23, 2018

  1. llvm-{5,6}: unconditionally set triples

    Previously we only set these when using musl.
    
    See #42452 (comment)
    
    Same should be done for changes in #42452,
    I'll add a follow-up commit doing so in the PR containing this
    or wherever makes sense-- depending on how review/merging of that goes.
    
    Sending similar changes for LLVM 4 to master, as suggested.
    dtzWill committed Jun 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    7088489 View commit details

Commits on Jun 27, 2018

  1. Merge pull request #42454 from dtzWill/fix/llvm-triples-unconditional

    llvm-{5,6}: unconditionally set triples
    dtzWill authored Jun 27, 2018
    Copy the full SHA
    27351f8 View commit details
Showing with 9 additions and 10 deletions.
  1. +4 −5 pkgs/development/compilers/llvm/5/llvm.nix
  2. +5 −5 pkgs/development/compilers/llvm/6/llvm.nix
9 changes: 4 additions & 5 deletions pkgs/development/compilers/llvm/5/llvm.nix
Original file line number Diff line number Diff line change
@@ -80,6 +80,10 @@ in stdenv.mkDerivation (rec {
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"

"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
]
++ stdenv.lib.optional enableSharedLibraries
"-DLLVM_LINK_LLVM_DYLIB=ON"
@@ -95,11 +99,6 @@ in stdenv.mkDerivation (rec {
++ stdenv.lib.optionals (isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"
]
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
];

postBuild = ''
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/6/llvm.nix
Original file line number Diff line number Diff line change
@@ -76,6 +76,10 @@ in stdenv.mkDerivation (rec {
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"

"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
]
++ stdenv.lib.optional enableSharedLibraries
"-DLLVM_LINK_LLVM_DYLIB=ON"
@@ -92,11 +96,7 @@ in stdenv.mkDerivation (rec {
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"
]
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
] ++ stdenv.lib.optional enableWasm
++ stdenv.lib.optional enableWasm
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
;