Skip to content

llvmPackages_{10,11}.compiler-rt: restrict build to current arch #116833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 2 commits into from
Mar 19, 2021
Merged

llvmPackages_{10,11}.compiler-rt: restrict build to current arch #116833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cc0010
llvmPackages_*.compiler-rt: use darwinArch
thefloweringash Mar 19, 2021
2a588da
llvmPackages_{10,11}.compiler-rt: restrict build to current arch
thefloweringash Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/10/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
# 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}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
"-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
];

outputs = [ "out" "dev" ];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/11/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ lib.optionals (stdenv.isDarwin) [
"-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
"-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/5/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation {
# 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}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];

outputs = [ "out" "dev" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/6/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation {
# 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}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];

outputs = [ "out" "dev" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation {
# 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}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];

outputs = [ "out" "dev" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/8/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation {
# 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}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];

outputs = [ "out" "dev" ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/9/compiler-rt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# 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}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];

outputs = [ "out" "dev" ];
Expand Down