Skip to content

Fix docker-utils #2767

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
Jun 5, 2020
Merged

Fix docker-utils #2767

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions Utilities/Docker/docker-utils
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@ def docker_run(command_args):
"""Runs a command in the container."""
swiftpm_dir = os.path.normpath(os.path.join(script_dir, '../..'))
llbuild_dir = os.path.normpath(os.path.join(swiftpm_dir, '../llbuild'))
swift_driver_dir = os.path.normpath(os.path.join(swiftpm_dir, '../swift-driver'))
yams_dir = os.path.normpath(os.path.join(swiftpm_dir, '../yams'))
call([
"docker",
"run",
"-it",
"--security-opt", "seccomp=unconfined",
"-v", "%s:/swiftpm" % swiftpm_dir,
"-v", "%s:/llbuild" % llbuild_dir,
"-v", "%s:/swift-driver" % swift_driver_dir,
"-v", "%s:/yams" % yams_dir,
"-w", "/swiftpm",
"--rm",
"swiftpm-docker-1804"
Expand Down
9 changes: 5 additions & 4 deletions Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,11 @@ def build_yams(args):
cmake_flags.append("-DCMAKE_C_FLAGS=-target x86_64-apple-macosx%s" % g_macos_deployment_target)
cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
else:
cmake_flags += [
get_dispatch_cmake_arg(args),
get_foundation_cmake_arg(args),
]
if args.dispatch_build_dir:
cmake_flags.append(get_dispatch_cmake_arg(args))

if args.foundation_build_dir:
cmake_flags.append(get_foundation_cmake_arg(args))

build_with_cmake(args, cmake_flags, args.yams_source_dir, args.yams_build_dir)

Expand Down