Skip to content

Commit 5370aab

Browse files
committed
bootstrap: check the new Foundation layout
Ensure that we check the new Foundation location for the paths to the libraries.
1 parent e34bdb2 commit 5370aab

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Utilities/bootstrap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,10 @@ def main():
12011201

12021202
for module in ["Foundation", "FoundationNetworking", "FoundationXML"]:
12031203
# Add the library.
1204-
symlink_force(os.path.join(args.foundation_path, 'lib' + module + '.so'), libswiftdir)
1204+
for path in ('Foundation', ''):
1205+
if os.path.exists(os.path.join(args.foundation_path, path, 'lib{}.so'.format(module))):
1206+
symlink_force(os.path.join(args.foundation_path, path, 'lib{}.so'.format(module)), libswiftdir)
1207+
break
12051208

12061209
# Add Foundation's swiftmodule.
12071210
for extension in [".swiftmodule", ".swiftdoc"]:

0 commit comments

Comments
 (0)