| Commit message (Collapse) | Author | Age |
|
|
|
|
| |
This reverts commit 89efc27f571368b475ce87e71445be10a9d1121a, reversing
changes made to d0f11020ca55dfe20ecad05005343e3a3e3cbd90.
|
| |
|
|
|
|
|
|
| |
getTargetRoleEnvHook
Fixes include and link paths when cross compiling.
|
|\ |
|
| |\
| | |
| | | |
treewide: Modular setup hooks
|
| | |
| | |
| | |
| | |
| | | |
Also fix some setup hooks that unnecessarily used environment hooks,
which revolted in the same variable being modified too many times.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 0dbc0067604eb9629d1458fcf2b226a88e728f14, reversing
changes made to cb7f7742652acdf3086b3d132163b5ea2c2328eb.
Should go into staging.
|
| | | |
|
| |/
| |
| |
| |
| | |
This reverts commit 6c064e6b1f34a8416f990db0cc617a7195f71588, reapplying
PR #28029 which was supposed to have gone to staging all along.
|
|/
|
|
|
|
|
|
|
|
|
|
| |
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)
Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:
- bintools-wrapper and cc-wrapper
|
|
|
|
|
|
|
|
|
|
|
|
| |
- All deps go on the PATH
- CC and Bintools wrappers with their host != depender's host still get their
setup hooks run.
- Environment hooks get applied to all packages
This isn't so elegent, but eases the transition on a very significant
PR.
|
|
|
|
|
|
|
| |
We now have the information to properly determine the role the
cc-wrapper dependency has, by taking advantage of `offset`. No longer
use the soon-to-be-deprecated crossConfig environment variable, the
temp hack used before this change.
|
|
|
|
|
|
| |
Factor a bintools (i.e. binutils / cctools) wrapper out of cc-wrapper. While
only LD is wrapped, the setup hook defines environment variables on behalf of
other utilites.
|
|
|
|
| |
For example, `BUILD_CC` and `CC_FOR_BUILD`
|
|
|
|
| |
Also fix alphabetical order
|
|
|
|
|
| |
Rename to `cmd` too, as uppercase typically means the variable is
exported.
|
|
|
|
|
| |
I thought my sed in e755a8a27d5c33d87a5742817c373028d35443e9 was
exhaustive, but it was not.
|
|
|
|
|
|
|
| |
CPP defaults to $(CC) -E and setting it explicitly seems to cause
issues in a number of packages like gcc and gdb.
https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html
|
|
|
|
| |
See the added comments for what exactly has been done.
|
|
|
|
|
|
|
|
|
| |
This is basically a sed job, in preparation of the next commit. The
rules are more or less:
- s"NIX_(.._WRAPPER_)?([a-zA-Z0-9@]*)"NIX_\1@infixSalt@_\2"g
- except for non-cc-wrapper-specific vars like `NIX_DEBUG`
|
|
|
|
|
| |
In many cases, this involved taking @orivej's and @edolstra's recent
ld-wrapper improvements, and applying then elsewhere.
|
|
|
|
| |
This is a temporary measure until this impurity is removed from Nix.
|
|
|
|
|
| |
While this requires newer bash, stdenv's setup.sh now does across the
board anyways. This way is more concise.
|
|
|
|
| |
Before, this only happened when cross compiling.
|
|\
| |
| |
| |
| | |
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
|
| |
| |
| |
| |
| |
| | |
Otherwise, when building glibc and other packages, the "strip" from
bootstrapTools is used, which doesn't recognise some tags produced by
the newer "ld" from binutils.
|
|\|
| |
| |
| | |
Many non-conflict problems weren't (fully) resolved in this commit yet.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts d927da8dae1c4ff0c492d41e00835cfd08ff84d7. Having a copy
of gcc-wrapper/setup-hook.sh is bad for maintainability - it had
already started to diverge. Also, gccStdInc gave a nix-env conflict
with the standard gcc. And it wasn't actually used in Nixpkgs.
Instead, if you really need to change "-isystem" to "-I", you can now
set ccIncludeFlag to "-I".
|
|/
|
|
|
|
|
|
| |
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
|
|
|
|
|
|
| |
- Add a conditional flag for the c++ std lib
- Build binaries that get linked by our own dyld (someday)
- Automatically add framework directories in the setup hook
|
|
|
|
|
|
| |
Fixes #5949
Suggested by @ambrop72
|
| |
|
|
also makes cc-wrapper compatible with clang in the darwin fork.
|