-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rustpkg: Allow package directories to appear in the RUST_PATH
This commit adds a rustpkg flag, --rust-path-hack, that allows rustpkg to *search* inside package directories if they appear in the RUST_PATH, while *building* libraries and executables into a different target directory. This behavior is hidden behind a flag because I believe we only want to support it temporarily, to make it easier to port servo to rustpkg. This commit also includes a fix for how rustpkg fetches sources from git repositories -- it uses a temporary directory as the target when invoking `git clone`, then moves that directory into the workspace if the clone was successful. (The old behavior was that when the `git clone` failed, the empty target directory would be left lying around anyway.)
- Loading branch information
1 parent
7cbdee1
commit 98e470a
Showing
8 changed files
with
428 additions
and
103 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
98e470a
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.
saw approval from catamorphism
at catamorphism@98e470a
98e470a
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.
merging catamorphism/rust/extend_rust_path = 98e470a into auto
98e470a
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.
catamorphism/rust/extend_rust_path = 98e470a merged ok, testing candidate = 8002a09
98e470a
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.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1210
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1213
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/319
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/319
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1229
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/320
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/320
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1229
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/320
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/320
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/401
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1213
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/319
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/319
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/998
98e470a
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.
fast-forwarding master to auto = 8002a09