diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5')
3 files changed, 12 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix index cd7d952243ce..b5e7b54fa5be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix index 32d6dd3d4795..41f2b24b057e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix index f8185fc3ff4b..9bebedbc0442 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" |