Skip to content

Commit 18f2d29

Browse files
committed
Removed more Darwin rpaths into the toolchain
A macOS that contains the dyld issue worked around by swiftlang/swift#37978 has been deployed by Swift CI, so we can't do this anymore on Darwin.
1 parent a4d87a1 commit 18f2d29

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

Utilities/bootstrap

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -792,26 +792,6 @@ def get_swiftpm_flags(args):
792792
"-Xlinker", "@executable_path/../lib/swift/pm/llbuild",
793793
])
794794

795-
# Add a relative rpath to find Swift libraries in toolchains.
796-
# On non-Darwin platforms, a relative rpath is necessary because Swift
797-
# libraries are not part of the OS.
798-
# On Darwin platforms, a relative rpath is necessary for experimental
799-
# toolchains that include libraries not part of the OS (e.g. PythonKit or
800-
# TensorFlow).
801-
if '-macosx' in args.build_target:
802-
# rpaths for compatibility libraries
803-
for lib_path in get_swift_backdeploy_library_paths(args):
804-
build_flags.extend(["-Xlinker", "-rpath", "-Xlinker", lib_path])
805-
806-
build_flags.extend(
807-
[
808-
"-Xlinker",
809-
"-rpath",
810-
"-Xlinker",
811-
"@executable_path/../" + args.platform_path.group(1),
812-
]
813-
)
814-
815795
if '-openbsd' in args.build_target:
816796
build_flags.extend(["-Xlinker", "-z", "-Xlinker", "origin"])
817797
build_flags.extend(["-Xcc", "-I/usr/local/include"])

0 commit comments

Comments
 (0)