Unverified Commit 463b83a0 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Darwin stdenvBootstrap fixes 2025-10 (#448523)

parents a8a9994a b0ff7e6b

pkgs/stdenv/darwin/bootstrap-files/aarch64-apple-darwin.nix

+2 −0
Original line number Diff line number Diff line 
# FIXME: Changed to arm64-apple-darwin in release.nix stdenvBootstrapTools, please handle when refreshing



# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:

# $ ./refresh-tarballs.bash --targets=aarch64-apple-darwin

#

pkgs/stdenv/darwin/test-bootstrap-tools.nix

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ derivation { 
    # The stdenv bootstrap builds the SDK in the bootstrap. Use an existing SDK to test the tools.

    export SDKROOT='${apple-sdk.sdkroot}'



    export flags="-idirafter $SDKROOT/usr/include --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L$tools/lib -DTARGET_OS_IPHONE=0"

    export resource_dir="$(echo "$tools"/lib/clang/*)" # Expand wildcard

    export flags="-resource-dir=$resource_dir -idirafter $SDKROOT/usr/include --sysroot=$SDKROOT -L$SDKROOT/usr/lib -L$tools/lib -DTARGET_OS_IPHONE=0"



    export CPP="clang -E $flags"

    export CC="clang $flags"
@@ -77,7 +78,7 @@ derivation { 
    # using -Wl,-flat_namespace is required to generate an error

    mkdir libtest/

    ln -s $tools/lib/libc++.dylib libtest/

    clang++ -Wl,-flat_namespace -idirafter $SDKROOT/usr/include -isystem$tools/include/c++/v1 \

    clang++ -Wl,-flat_namespace -resource-dir=$resource_dir -idirafter $SDKROOT/usr/include -isystem$tools/include/c++/v1 \

      --sysroot=$SDKROOT -L$SDKROOT/usr/lib  -L./libtest -L$PWD/libSystem-boot hello3.cc



    tar xvf ${hello.src}

pkgs/top-level/release.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
  supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),

  # The platform triples for which we build bootstrap tools.

  bootstrapConfigs ? [

    "aarch64-apple-darwin"

    "arm64-apple-darwin"

    "aarch64-unknown-linux-gnu"

    "aarch64-unknown-linux-musl"

    "i686-unknown-linux-gnu"