From ccad05314513003521bf708ce2dd5a7bdfb41839 Mon Sep 17 00:00:00 2001 From: Lily Vulcano Date: Tue, 11 Dec 2018 13:57:33 -0800 Subject: [PATCH 1/3] =?UTF-8?q?Ensure=20that=20component=20module=20librar?= =?UTF-8?q?ies=20are=20now=20picked=20up=20alongside=20Foundation=E2=80=99?= =?UTF-8?q?s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utilities/bootstrap | 1 + 1 file changed, 1 insertion(+) diff --git a/Utilities/bootstrap b/Utilities/bootstrap index 01e94dbd066..9ee9a5734c9 100755 --- a/Utilities/bootstrap +++ b/Utilities/bootstrap @@ -1129,6 +1129,7 @@ def main(): # Add libFoundation. symlink_force(os.path.join(args.foundation_path, 'libFoundation.so'), libswiftdir) + symlink_force(os.path.join(args.foundation_path, 'libFoundationSoil.so'), libswiftdir) # Add Foundation's swiftmodule. for module_file in ["Foundation.swiftmodule", "Foundation.swiftdoc"]: From 615af6802fecd9e936e32893be8f48381f398f60 Mon Sep 17 00:00:00 2001 From: Lily Vulcano Date: Wed, 2 Jan 2019 14:44:05 -0800 Subject: [PATCH 2/3] Rename FoundationSoil to FoundationBase. --- Utilities/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/bootstrap b/Utilities/bootstrap index 9ee9a5734c9..7db4ca8c2a5 100755 --- a/Utilities/bootstrap +++ b/Utilities/bootstrap @@ -1129,7 +1129,7 @@ def main(): # Add libFoundation. symlink_force(os.path.join(args.foundation_path, 'libFoundation.so'), libswiftdir) - symlink_force(os.path.join(args.foundation_path, 'libFoundationSoil.so'), libswiftdir) + symlink_force(os.path.join(args.foundation_path, 'libFoundationBase.so'), libswiftdir) # Add Foundation's swiftmodule. for module_file in ["Foundation.swiftmodule", "Foundation.swiftdoc"]: From 429d265b8ff87dc840f9f60d80ef582ec6f9be50 Mon Sep 17 00:00:00 2001 From: Lily Vulcano Date: Tue, 15 Jan 2019 16:13:35 -0800 Subject: [PATCH 3/3] Add FoundationBase Swift module symlinks here. --- Utilities/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/bootstrap b/Utilities/bootstrap index 7db4ca8c2a5..d6d6541a297 100755 --- a/Utilities/bootstrap +++ b/Utilities/bootstrap @@ -1132,7 +1132,7 @@ def main(): symlink_force(os.path.join(args.foundation_path, 'libFoundationBase.so'), libswiftdir) # Add Foundation's swiftmodule. - for module_file in ["Foundation.swiftmodule", "Foundation.swiftdoc"]: + for module_file in ["Foundation.swiftmodule", "Foundation.swiftdoc", "FoundationBase.swiftmodule", "FoundationBase.swiftdoc"]: symlink_force(os.path.join(args.foundation_path, 'swift', module_file), libincludedir) # Add CoreFoundation "framework". This just contains the header and the modulemap.