Skip to content

Commit 894775e

Browse files
committed
[Bootstrap] Remove extra quotes from manifest
These quotes are not needed now since we shifted to new llbuild args format which takes array and not a string.
1 parent 7821152 commit 894775e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Utilities/bootstrap

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -471,27 +471,28 @@ def create_bootstrap_files(sandbox_path, args):
471471
elif target.is_c and target.is_library:
472472
# We have to use shared library for interpolation between Swift and C so we can't use static library for C Targets.
473473
link_output_path = os.path.join(lib_dir, target.name + g_shared_lib_ext)
474-
link_command = ['clang', ' '.join(pipes.quote(o) for o in objects), '-shared',
475-
'-o', pipes.quote(link_output_path)]
474+
link_command = ['clang']
475+
link_command.extend(objects)
476+
link_command.extend(['-shared', '-o', link_output_path])
476477
elif target.is_c and not target.is_library:
477478
error("Executable C target not supported by bootstrap yet")
478479
elif target.is_swift and not target.is_library:
479480
link_output_path = os.path.join(bin_dir, target.name)
480481

481482
link_command = [args.swiftc_path,
482-
'-o', pipes.quote(link_output_path)]
483+
'-o', link_output_path]
483484
if args.sysroot:
484485
link_command.extend(["-sdk", args.sysroot])
485486
if platform.system() == 'Darwin':
486487
link_command.extend(["-target", "x86_64-apple-macosx10.10"])
487-
link_command.append(' '.join(pipes.quote(o) for o in objects))
488+
link_command.extend(objects)
488489
for dependency in target.dependencies:
489490
dep_target = target_map[dependency]
490491
if dep_target.is_swift:
491492
dependency_lib_path = os.path.join(lib_dir, "%s.a" % dependency)
492493
else:
493494
dependency_lib_path = os.path.join(lib_dir, dependency + g_shared_lib_ext)
494-
link_command.append(pipes.quote(dependency_lib_path))
495+
link_command.append(dependency_lib_path)
495496
linked_libraries.append(dependency_lib_path)
496497
if platform.system() == 'Darwin':
497498
link_command.extend(["-Xlinker", "-all_load"])

0 commit comments

Comments
 (0)