Skip to content
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

Jump to bottom

Use 10.16 for -sdk_version #2

Merged
merged 2 commits into from Dec 8, 2020
Merged

Use 10.16 for -sdk_version #2

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
ae431e1
bintools-wrapper: use minSdkVersion and appleSdkVersion from stdenv
matthewbauer Dec 8, 2020
cd92ef3
stdenv/darwin: use 10.16 for aarch64
matthewbauer Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/build-support/bintools-wrapper/default.nix
View file
Open in desktop
Expand Up @@ -254,7 +254,7 @@ stdenv.mkDerivation {

# Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.
+ optionalString stdenv.targetPlatform.isMacOS ''
echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before
echo "-macosx_version_min ${stdenv.minSdkVersion or "10.12"} -sdk_version ${stdenv.appleSdkVersion or "10.12"} -no_uuid" >> $out/nix-support/libc-ldflags-before
''

##
Expand Down
4 changes: 2 additions & 2 deletions pkgs/stdenv/darwin/default.nix
View file
Open in desktop
@@ -1,9 +1,9 @@
{ lib
, localSystem, crossSystem, config, overlays, crossOverlays ? []
# The version of darwin.apple_sdk used for sources provided by apple.
, appleSdkVersion ? "10.12"
, appleSdkVersion ? if localSystem.isAarch64 then "10.16" else "10.12"
# Minimum required macOS version, used both for compatibility as well as reproducability.
, macosVersionMin ? "10.12"
, macosVersionMin ? if localSystem.isAarch64 then "10.16" else "10.12"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ?
if localSystem.isAarch64 then
Expand Down