diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/llvm')
24 files changed, 85 insertions, 38 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" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index 4f5e20cfe770..2de5f65b4a13 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix @@ -20,10 +20,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/11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index a404d1606957..e6765ec68990 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -7,7 +7,7 @@ let release_version = "11.0.0"; - version = "${release_version}"; # differentiating these (variables) is important for RCs + version = release_version; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix index 3f37cac078f9..c2b70a149bf5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix @@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { 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" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix index 8f6479fe2f4e..ec3effebfd77 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/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/6/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix index 89f25cad2c54..8bd61f5d7f70 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/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/6/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix index a922bcfaf0ea..727a32260872 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/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" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index 905ec862ad7e..969938681fe9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -20,10 +20,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 lld ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index 97a5d73f3041..ec9b7e6e6ad4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/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/7/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index 83c05cf0e634..76baadf1c6e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -24,9 +24,12 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libcxxabi ] ; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix index 97141a0bd402..7f2ec528f3c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,4 +1,5 @@ { stdenv, cmake, fetch, libcxx, llvm, version +, standalone ? false # on musl the shared objects don't build , enableShared ? ! stdenv.hostPlatform.isMusl }: @@ -20,7 +21,9 @@ stdenv.mkDerivation { patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} ''; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; + cmakeFlags = + stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++ + stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; installPhase = if stdenv.isDarwin then '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index 2d7fc8068900..5c1dca5e33b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -20,10 +20,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 lld ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index a907d4086550..3c6265c4fca0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/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/8/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index 9c0c7951c794..01e0d8e008cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -25,9 +25,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" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix index 81117e904d82..cfaee05944ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix @@ -20,10 +20,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 lld ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix index 394f66ff7f1a..13b0b522771f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/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/9/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix index cec6de61ca99..c9f0e6254ab4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/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" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 3e2c3cec0c1f..c67b011721a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6"; + hash = "sha256-Lnma831RXJMnn3N8im3QLy6dYfXAvtbeFX/0CKvpkgY="; }; in rec { clang = wrapCCWith rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix index 052bfd1c62d8..34a094bf379c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" + + # Fix lld binary path for CMake. + substituteInPlace "$dev/lib/cmake/lld/LLDTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld" ''; meta = with stdenv.lib; { |