Skip to content

build: add support for new build layout for libdispatch #2352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2019
Merged

build: add support for new build layout for libdispatch #2352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ class Target(object):
import_paths.append(os.path.join(args.libdispatch_build_dir, 'lib'))
import_paths.append(os.path.join(args.libdispatch_build_dir, "src"))
import_paths.append(os.path.join(args.libdispatch_build_dir, "src", "swift"))
import_paths.append(os.path.join(args.libdispatch_build_dir, "src", "swift", "swift"))
if args.libdispatch_source_dir:
import_paths.append(args.libdispatch_source_dir)
if args.xctest_path:
Expand Down Expand Up @@ -1205,7 +1206,14 @@ def main():

# Add swiftmodules.
for module_file in ["Dispatch.swiftmodule", "Dispatch.swiftdoc"]:
symlink_force(os.path.join(args.libdispatch_build_dir, 'src', 'swift', module_file), libincludedir)
paths = [
os.path.join(args.libdispatch_build_dir, 'src', 'swift', 'swift', module_file),
os.path.join(args.libdispatch_build_dir, 'src', 'swift', module_file),
]
for path in paths:
if os.path.exists(path):
symlink_force(path, libincludedir)
continue

symlink_force(os.path.join(args.libdispatch_source_dir), os.path.join(libincludedir, "dispatch"))

Expand Down