Skip to content

[Bootstrap] Fix spaces in Xcode issue#669

Merged
aciidgh merged 2 commits intoswiftlang:masterfrom
aciidgh:xcode-space-issue
Sep 24, 2016
Merged

[Bootstrap] Fix spaces in Xcode issue#669
aciidgh merged 2 commits intoswiftlang:masterfrom
aciidgh:xcode-space-issue

Conversation

@aciidgh
Copy link
Contributor

@aciidgh aciidgh commented Sep 19, 2016

sdk and compiler path needed escaping.

'-o', pipes.quote(link_output_path)]
if args.sysroot:
link_command.extend(["-sdk", args.sysroot])
link_command.extend(["-sdk", pipes.quote(args.sysroot)])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't feel right, something else must be wrong here... we should be passing each argument in this array literally.

I think the actual probably might be in how we pass this command to swift-build-tool, maybe we are using the old arguments form?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes its using the old arguments form but using array literal did not work because of some commands were separated by a ;

Copy link
Contributor Author

@aciidgh aciidgh Sep 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

args: rm -f /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/lib/PackageDescription.a ; ar cr /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/lib/PackageDescription.a /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/PackageDescription.build/JSON.o /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/PackageDescription.build/Package.o /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/PackageDescription.build/Product.o /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/PackageDescription.build/Target.o /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/PackageDescription.build/Version+StringLiteralConvertible.o /Users/ankit/workspace/opensource/swift.org/swiftpm/.build/.bootstrap/PackageDescription.build/Version.o

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good news: llbuild now has an archive tool which embeds this logic, so we can just switch to that.

Part of this bug:
- https://bugs.swift.org/browse/SR-2650
- <rdar://problem/28318153> SR-2650 Can't build swiftpm with using Xcode
that has a whitespace in its name
- https://bugs.swift.org/browse/SR-2650
- <rdar://problem/28318153> SR-2650 Can't build swiftpm with using Xcode
that has a whitespace in its name
@aciidgh
Copy link
Contributor Author

aciidgh commented Sep 20, 2016

@ddunbar done

@aciidgh aciidgh assigned ddunbar and unassigned aciidgh Sep 20, 2016
@abertelrud
Copy link
Contributor

LGTM

@aciidgh
Copy link
Contributor Author

aciidgh commented Sep 23, 2016

@swift-ci please test

@aciidgh
Copy link
Contributor Author

aciidgh commented Sep 23, 2016

@swift-ci please test linux

1 similar comment
@ddunbar
Copy link
Contributor

ddunbar commented Sep 24, 2016

@swift-ci please test linux

@ddunbar
Copy link
Contributor

ddunbar commented Sep 24, 2016

LGTM

@ddunbar ddunbar assigned aciidgh and unassigned ddunbar Sep 24, 2016
@aciidgh
Copy link
Contributor Author

aciidgh commented Sep 24, 2016

@swift-ci please test linux

@aciidgh aciidgh merged commit 047786f into swiftlang:master Sep 24, 2016
@aciidgh aciidgh deleted the xcode-space-issue branch September 24, 2016 14:14
@aciidgh aciidgh restored the xcode-space-issue branch September 27, 2016 17:15
@aciidgh aciidgh deleted the xcode-space-issue branch October 17, 2016 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants