boost: Clean, reducing duplication #33188
Merged
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
Ericson2314
added
the
6.topic: cross-compilation
Ericson2314
force-pushed
the
clean-boost
branch
from
28fe756
to
49abae8
Compare
Ericson2314
changed the title
|
I differed the native derivations of the default version, and nothing interesting is different: just argument order and extra |
Ericson2314
added this to Needed by the big PR---nice to move pick off pieces of it and move here, rebasing the big PR on top
in Cross compilation
13 tasks
|
Looking to finally merge #26805, so Boost maintainer, whoever you are, I hope you aren't on an internet-free vacation! (This blocks that.) |
orivej
approved these changes
Dec 30, 2017
globin
approved these changes
Dec 30, 2017
|
|
||
| withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; | ||
| cxxflags = optionalString (enablePIC) "-fPIC"; |
There was a problem hiding this comment.
You should be able to drop all PIC handling, "fixed" by hardening ages ago
|
|
||
| genericB2Flags = [ | ||
| linkflags = optionalString (enablePIC) "-fPIC"; |
| else | ||
| ""; | ||
| cflags = concatStringsSep " " | ||
| (optional (enablePIC) "-fPIC" ++ |
|
@globin Ah, you mentioned that before, and I guess I forgot! turns out the option was unused so it was dead code anyways. |
Ericson2314
force-pushed
the
clean-boost
branch
from
49abae8
to
820f264
Compare
This was motivated originally by my cross work, but that goal requires a few more commits to other things. Still, it's good to start the cleanup now / get things out of the way.
Ericson2314
force-pushed
the
clean-boost
branch
from
820f264
to
76b5904
Compare
Ericson2314
commented
Dec 31, 2017
| , enableRelease ? true | ||
| , enableDebug ? false | ||
| , enableSingleThreaded ? false | ||
| , enableMultiThreaded ? true | ||
| , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now | ||
| , enableStatic ? !enableShared | ||
| , enablePIC ? false |
There was a problem hiding this comment.
This is unused, and hardening provides it anyways
| , enableRelease ? true | ||
| , enableDebug ? false | ||
| , enableSingleThreaded ? false | ||
| , enableMultiThreaded ? true | ||
| , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now | ||
| , enableStatic ? !enableShared | ||
| , enablePIC ? false | ||
| , enableExceptions ? false |
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.
Motivation for this change
This was motivated originally by my cross work, but that goal requires a few more commits to other things. Still, it's good to start the cleanup now / get things out of the way.
Things done
Native is almost exactly tested as part of #26805. However, In that version I had this setup hook replicating some logic with
findInputsdownstream that's since been removed. I removed the setup hook for this PR so now this is technically untested, but I doubt anything changed.Actually its even better, the setup hook traverses propagated dependencies, but no version of boost has any, so its demonstrably a no-op!
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)