public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_*.compiler-rt: use darwinArch

Browse Source
This commit is contained in:
Andrew Childs 2021-03-19 20:40:13 +09:00 committed by github-actions[bot]
parent a9e8aa4dd4
commit 8cc0010f0c
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/10/compiler-rt.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin # 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 # 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. # when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/development/compilers/llvm/11/compiler-rt.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [
"-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF"

2
pkgs/development/compilers/llvm/5/compiler-rt.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin # 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 # 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. # when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/development/compilers/llvm/6/compiler-rt.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin # 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 # 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. # when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/development/compilers/llvm/7/compiler-rt.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin # 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 # 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. # when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/development/compilers/llvm/8/compiler-rt.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin # 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 # 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. # when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/development/compilers/llvm/9/compiler-rt.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin # 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 # 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. # when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];