buildRustCrate: dont clobber src /w gen code #78414
Closed
+2
−7
Conversation
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
mkaito
requested changes
Jan 24, 2020
| @@ -140,11 +140,8 @@ in '' | |||
|
|
|||
| set -e | |||
| if [[ -n "$(ls target/build/${crateName}.out)" ]]; then | |||
There was a problem hiding this comment.
Don't nest two if with a single clause each. You can chain conditions inside [[ with &&.
There was a problem hiding this comment.
I’m not super confident dealing with the mess that bash is to start refactoring this code.
There was a problem hiding this comment.
if [[ -n "$(ls target/build/${crateName}.out)" && -e "${libPath}" ]]; then
cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/
fiBasically.
Although there's some quoting I could be fussy about, that seems off topic.
There was a problem hiding this comment.
Please make sure I didn't accidentally copy paste the wrong thing 😄
If a crate happened to have a build script that generates a file with the name that’s the same with another file in `src/`, this little snippet of code would overwrite the source with generated code… Having looked at the history I failed to find justification for this behaviour and since it makes actual crates (rustversion) fail to build, this snippet has to go. See ya!
nagisa
force-pushed
the
nagisa/unclobberize-configure-crate-upstream
branch
from
d98810c to
503c13d
Compare
andir
reviewed
Jan 28, 2020
| @@ -139,13 +139,8 @@ in '' | |||
| | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env | |||
|
|
|||
| set -e | |||
| if [[ -n "$(ls target/build/${crateName}.out)" ]]; then | |||
There was a problem hiding this comment.
I don't think we have to keep the libPath version of this. This would just cause the same issue for any crate that has a custom path to the lib.rs file configured.
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.
If a crate happened to have a build script that generates a file with
the name that’s the same with another file in
src/, this littlesnippet of code would overwrite the source with generated code…
Having looked at the history I failed to find justification for this
behaviour and since it makes actual crates (rustversion) fail to build,
this snippet has to go. See ya!
Fixes #78412
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)r? @andir