diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10')
3 files changed, 11 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix index a3d6e7e402ab..fef7720d726d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ 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++14" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix index 47bbe808ac20..e6882cbabb8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { "-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/10/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix index 651f1887553d..95711903932e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" |