diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-12-13 14:37:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-12-13 14:40:37 +0100 |
| commit | e53d1600cb67069ed39a4b7a00ca21b48ae7860b (patch) | |
| tree | b966f79c8abdc29cf7b6474df6422cb8792a6e13 /pkgs/development | |
| parent | eddcc4a5157e9bbc5ed226f4ce1c194a2b832cdd (diff) | |
Revert #201485: llvmPackages_14: Fix build on aarch64-linux
This reverts commits 74965741696bf and 38c793c1de. llvm_14 wouldn't even build on aarch64-linux (test phase).
Diffstat (limited to 'pkgs/development')
5 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/development/compilers/llvm/14/clang/default.nix b/pkgs/development/compilers/llvm/14/clang/default.nix index 6086c65dca169..55d879fb76e4c 100644 --- a/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -26,9 +26,6 @@ let buildInputs = [ libxml2 libllvm ]; - # workaround https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then "-lgcc" else null; - cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix index 994d6eaaad6a1..4351c56ef530b 100644 --- a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -35,9 +35,6 @@ stdenv.mkDerivation { "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; - # workaround https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then "-lgcc" else null; - cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" diff --git a/pkgs/development/compilers/llvm/14/lld/default.nix b/pkgs/development/compilers/llvm/14/lld/default.nix index 8938c5de93f59..2e0d893c7febe 100644 --- a/pkgs/development/compilers/llvm/14/lld/default.nix +++ b/pkgs/development/compilers/llvm/14/lld/default.nix @@ -34,9 +34,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libllvm libxml2 ]; - # workaround https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then "-lgcc" else null; - cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; diff --git a/pkgs/development/compilers/llvm/14/lldb/default.nix b/pkgs/development/compilers/llvm/14/lldb/default.nix index 28d3a2bd3ff4f..2493dcde0c845 100644 --- a/pkgs/development/compilers/llvm/14/lldb/default.nix +++ b/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -86,9 +86,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ]; - # workaround https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then "-lgcc" else null; - cmakeFlags = [ "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLVM_ENABLE_RTTI=OFF" diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 4cc6c80dd4aa9..673cd31460e83 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -129,9 +129,6 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - # workaround https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then "-lgcc" else null; - cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via |