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

Commits on May 23, 2017

  1. llvmPackages_34.llvm: fix output of llvm-config 

    now llvm-config --libnames and llvm-config --libfiles output the proper
files.
    @Mic92
    Mic92 committed May 23, 2017
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c4f50c View commit details

  2. Merge pull request #26024 from Mic92/llvm-config-3.4 

    llvmPackages_34.llvm: fix output of llvm-config
    @Mic92
    Mic92 authored May 23, 2017
    Copy the full SHA
    4fecdce View commit details
Showing with 20 additions and 3 deletions.
  1. +13 −0 pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
  2. +7 −3 pkgs/development/compilers/llvm/3.4/llvm.nix
13 changes: 13 additions & 0 deletions pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
index eacefdf60bf..40d25f5cef8 100644
--- a/utils/llvm-build/llvmbuild/main.py
+++ b/utils/llvm-build/llvmbuild/main.py
@@ -412,7 +412,7 @@ subdirectories = %s
if library_name is None:
library_name_as_cstr = '0'
else:
- library_name_as_cstr = '"lib%s.a"' % library_name
+ library_name_as_cstr = '"lib%s.so"' % library_name
f.write(' { "%s", %s, %d, { %s } },\n' % (
name, library_name_as_cstr, is_installed,
', '.join('"%s"' % dep
10 changes: 7 additions & 3 deletions pkgs/development/compilers/llvm/3.4/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -29,12 +29,16 @@ in stdenv.mkDerivation rec {
'';

buildInputs =
[ perl groff cmake libxml2 libffi ]
++ stdenv.lib.optional (!stdenv.isDarwin) python2 /*
[ perl groff cmake libxml2 libffi python2 ] /*
++ stdenv.lib.optional stdenv.isLinux valgrind */;

propagatedBuildInputs = [ ncurses zlib ];

patches = stdenv.lib.optionals (!stdenv.isDarwin) [
# llvm-config --libfiles returns (non-existing) static libs
./fix-llvm-config.patch
];

# hacky fix: created binaries need to be run before installation
preBuild = ''
mkdir -p $out/
@@ -48,7 +52,7 @@ in stdenv.mkDerivation rec {
"-DLLVM_REQUIRES_RTTI=1"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";

postBuild = ''
rm -fR $out