Skip to content

Commit 6d2c465

Browse files
authored
Fixed overzealous path expansion for the --build-subdir argument which caused all build directories to generate relative to the directory build-script was invoked from. (#13319)
1 parent e287c30 commit 6d2c465

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

utils/build_swift/driver_arguments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ def create_argument_parser():
298298
help='enable code coverage analysis in Swift (false, not-merged, '
299299
'merged).')
300300

301-
option('--build-subdir', store_path,
301+
option('--build-subdir', store,
302+
metavar='PATH',
302303
help='name of the directory under $SWIFT_BUILD_ROOT where the '
303304
'build products will be placed')
304305
option('--install-prefix', store_path,
@@ -315,7 +316,6 @@ def create_argument_parser():
315316
option('--darwin-xcrun-toolchain', store,
316317
default=defaults.DARWIN_XCRUN_TOOLCHAIN,
317318
help='the name of the toolchain to use on Darwin')
318-
# TODO: Add executable check to store_path
319319
option('--cmake', store_path(executable=True),
320320
help='the path to a CMake executable that will be used to build '
321321
'Swift')

0 commit comments

Comments
 (0)