diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index dc15009aac72..2f6fa2a9450f 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -37,8 +37,6 @@ DarwinTools, apple-sdk_14, darwinMinVersionHook, - # TODO: Clean up on `staging` - lld, }: let @@ -254,8 +252,6 @@ stdenv.mkDerivation { DarwinTools # sw_vers fixDarwinDylibNames cctools.libtool - # TODO: Clean up on `staging` - lld ]; buildInputs = [ @@ -566,12 +562,6 @@ stdenv.mkDerivation { # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 cmakeFlags=" -GNinja - ${ - # Fix for ld64 hardening issue - # - # TODO: Clean up on staging - lib.optionalString stdenv.hostPlatform.isDarwin "-DCMAKE_LINKER_TYPE=LLD" - } -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"} -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 8af33b495e9d..ad4fe81c46cb 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -15,8 +15,7 @@ let inherit stdenv; swift-unwrapped = callPackage ./compiler { - # TODO: Clean up on `staging` - inherit (llvmPackages) stdenv lld; + inherit (llvmPackages) stdenv; inherit (darwin) DarwinTools sigtool; };