-
Notifications
You must be signed in to change notification settings - Fork 263
Add an option to specify the install prefix for CoreFoundation depend… #106
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.
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
Add an option to specify the install prefix for CoreFoundation depend… #106
Conversation
Cool, this seems to make sense. I find it a little strange that the installation prefix affects the layout of Foundation's build products directory, but I see that it does indeed work that way. Could you rebase this please? Sorry, I merged another PR which also had build script changes. |
"--foundation-install-prefix", | ||
help="Path to the installation location for swift-corelibs-foundation " | ||
"build products; CoreFoundation dependencies are expected to be " | ||
"found under $foundation_build_dir/$foundation_install_prefix.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it'd be nice to include in the description what the default value is. For example, the --lit
argument does this: "'%(default)s' by default."
.
a217df7
to
36b2ef3
Compare
@briancroom Thanks, I have rebased the patch. @modocache Thank you for the suggestion. I have updated the help message to make it indicate the default value and look more consistent with the other messages. |
@swift-ci please test |
CI seems unwilling to accept a request from me for this PR for whatever reason. The changes LGTM, but I'm unable to try it out myself right now and don't want to hit merge without seeing it actually execute. I'll try to give it a go tomorrow unless @modocache or someone else do so first. |
@swift-ci please test |
Swift CI appears to be a very fickle creature. It was listening to me just two hours ago... |
@swift-ci please test |
So strange! It listened to me just a minute ago. @shahmishal, do you have any idea why @swift-ci is choosing when to obey orders? Seriously, though, perhaps it has something to do with who submitted the pull request? I've noticed "@swift-ci please test" works for my own pull requests, but not this one. |
Maybe it has to do with the repo being owned by an organization rather than a personal account? If that's the case, I can move the branch to a personal repo. But that would be sad because I have a bunch of other pull requests in the same boat. |
Ok this checks out locally for me. I'm going to pull the trigger on it now. |
Great, thanks! I only just noticed this is related to the swiftlang/swift#2541. Great work!! 💯 |
Thanks @briancroom! |
…encies.
Currently, swift-corelibs-xctest will fail to build if build-script option
--install-prefix
is set to use a location other than/usr
. This is because build_script.py assumes that the CoreFoundation libraries can always be found under$foundation_build_dir/usr/lib/swift
. This patch adds a new option to the Python script, to allow the top-level build-script to pass the correct prefix to the swift-corelibs-xctest build.