Fixes to enable swift section objects #50
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -112,7 +118,7 @@ def main(): | |||
| run("{0} -c {1} -emit-object {2} -module-name XCTest -parse-as-library -emit-module " | |||
| "-emit-module-path {3}/XCTest.swiftmodule -o {3}/XCTest.o -force-single-frontend-invocation " | |||
| "-module-link-name XCTest".format(swiftc, style_options, " ".join(sourcePaths), build_dir)) | |||
| run("clang {0}/XCTest.o -shared -o {0}/libXCTest.so -Wl,--no-undefined -Wl,-soname,libXCTest.so -L{1}/lib/swift/linux/ -lswiftGlibc -lswiftCore -lm".format(build_dir, swift_build_dir)) | |||
| run("clang {1}/lib/swift/linux/{2}/swift_begin.o {0}/XCTest.o {1}/lib/swift/linux/{2}/swift_end.o -shared -o {0}/libXCTest.so -Wl,--no-undefined -Wl,-soname,libXCTest.so -L{1}/lib/swift/linux/ -lswiftGlibc -lswiftCore -lm".format(build_dir, swift_build_dir, arch)) | |||
There was a problem hiding this comment.
Fantastic. Thanks, @hpux735! 💯
Personally I've been meaning to reformat this convoluted string interpolation to use identifiers--something like the following:
run('clang {swift_build_dir}/lib/swift/linux/{arch}/swift_begin.o '
'{build_dir}/XCTest.o '
'{swift_build_dir}/lib/swift/linux/{arch}/swift_end.o '
'-shared -o {build_dir}/libXCTest.so '
'-Wl,--no-undefined -Wl,-soname,libXCTest.so '
'-L{swift_build_dir}/lib/swift/linux/ '
'-lswiftGlibc -lswiftCore -lm'.format(
build_dir=build_dir,
swift_build_dir=swift_build_dir,
arch=arch))Doing so makes it a little easier for me to follow what's going on. I can take care of that at a later time--I think this is fine for now!
|
@hpux735 @modocache Sorry, I need to merge this PR to keep builds correct. Could you submit fixes for @modocache's comments as a separate PR? |
gribozavr
added a commit
that referenced
this pull request
Feb 18, 2016
Fixes to enable swift section objects
|
Makes sense, thanks @gribozavr! I've addressed my comments in #51. Thanks again, @hpux735! 👍 |
modocache
added a commit
to modocache/swift-corelibs-xctest
that referenced
this pull request
Feb 18, 2016
The argument was added by swiftlang#50.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change enables xctest to continue to function once the swift sections changes are applied. This pull should not be applied prior to that change, and should be pulled at that time.
swiftlang/swift#1157
@gribozavr @tienex