summary refs log tree commit diff
path: root/pkgs/build-support/cc-wrapper/setup-hook.sh
Commit message (Collapse)AuthorAge
* Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path"Matthew Bauer2018-08-22
| | | | | This reverts commit 89efc27f571368b475ce87e71445be10a9d1121a, reversing changes made to d0f11020ca55dfe20ecad05005343e3a3e3cbd90.
* cc-wrapper: Define env vars with full pathJohn Ericson2018-08-06
|
* cc-wrapper, bintools-wrapper: use getHostRoleEnvHook instead of ↵Ben Wolsieffer2018-06-03
| | | | | | getTargetRoleEnvHook Fixes include and link paths when cross compiling.
* Merge remote-tracking branch 'upstream/staging' into strictDepsJohn Ericson2018-05-14
|\
| * Merge pull request #40139 from obsidiansystems/modular-setup-hooksJohn Ericson2018-05-07
| |\ | | | | | | treewide: Modular setup hooks
| | * treewide: Use pkgs/build-support/roles.bash to remove copy pastaJohn Ericson2018-05-07
| | | | | | | | | | | | | | | Also fix some setup hooks that unnecessarily used environment hooks, which revolted in the same variable being modified too many times.
| | * Revert "Merge pull request #28029 from cstrahan/hardening-fix"Matthew Bauer2018-04-10
| | | | | | | | | | | | | | | | | | | | | This reverts commit 0dbc0067604eb9629d1458fcf2b226a88e728f14, reversing changes made to cb7f7742652acdf3086b3d132163b5ea2c2328eb. Should go into staging.
| | * hardening: ld wrapper changes, setup-hook, etcCharles Strahan2018-03-06
| | |
| * | Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix""John Ericson2018-04-11
| |/ | | | | | | | | This reverts commit 6c064e6b1f34a8416f990db0cc617a7195f71588, reapplying PR #28029 which was supposed to have gone to staging all along.
* / treewide: Get rid of all uses of crossConfigJohn Ericson2018-05-14
|/ | | | | | | | | | | | 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
* stdenv-setup: Ease the transition with native buildsJohn Ericson2017-12-30
| | | | | | | | | | | | - 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.
* {bintools,cc}-wrapper: Fix setup hook to respect the role of the cc-compilerJohn Ericson2017-12-30
| | | | | | | 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.
* bintools-wrapper: InitJohn Ericson2017-12-13
| | | | | | 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.
* cc-wrapper: Define new- and old-style cross env varsJohn Ericson2017-11-28
| | | | For example, `BUILD_CC` and `CC_FOR_BUILD`
* cc-wrapper: Export env vars for objdump and readelf in setup-hookJohn Ericson2017-11-28
| | | | Also fix alphabetical order
* cc-wrapper: Don't leave CMD defined after setup hookJohn Ericson2017-11-28
| | | | | Rename to `cmd` too, as uppercase typically means the variable is exported.
* cc-wrapper: Fix stray binPrefix -> targetPrefixJohn Ericson2017-11-27
| | | | | I thought my sed in e755a8a27d5c33d87a5742817c373028d35443e9 was exhaustive, but it was not.
* cc-wrapper: don't export CPPDaiderd Jordan2017-08-16
| | | | | | | 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
* cc-wrapper: Make hygienicJohn Ericson2017-08-07
| | | | See the added comments for what exactly has been done.
* cc-wrapper: Unconditionally use @infixSalt@ accross the boardJohn Ericson2017-08-07
| | | | | | | | | 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`
* cc-wrapper: Pass shellcheck and other cleanupsJohn Ericson2017-08-04
| | | | | In many cases, this involved taking @orivej's and @edolstra's recent ld-wrapper improvements, and applying then elsewhere.
* stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shellJohn Ericson2017-07-26
| | | | This is a temporary measure until this impurity is removed from Nix.
* cc-wrapper: Use new bash uppercase subsitution syntax in setup hookJohn Ericson2017-07-15
| | | | | While this requires newer bash, stdenv's setup.sh now does across the board anyways. This way is more concise.
* cc-wrapper: Always export environment variables for binutilsJohn Ericson2017-07-15
| | | | Before, this only happened when cross compiling.
* Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
|\ | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * stdenv-linux: Ensure binutils comes before bootstrapTools in $PATHEelco Dolstra2016-02-28
| | | | | | | | | | | | 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.
* | Merge commit staging+systemd into closure-sizeVladimír Čunát2015-10-03
|\| | | | | | | Many non-conflict problems weren't (fully) resolved in this commit yet.
| * Remove gccStdIncEelco Dolstra2015-05-13
| | | | | | | | | | | | | | | | | | | | 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".
* | Merge 'staging' into closure-sizeVladimír Čunát2015-04-18
|/ | | | | | | | - 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.
* Some cc-wrapper changes to better support darwin and clang:Dan Peebles2015-02-08
| | | | | | - 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
* cc-wrapper: Fix for cross-compilingShea Levy2015-01-25
| | | | | | Fixes #5949 Suggested by @ambrop72
* cc-wrapper: Set CC/CXX more specifically if possibleShea Levy2015-01-16
|
* rename gcc-wrapper to cc-wrapper.Eric Seidel2015-01-14
also makes cc-wrapper compatible with clang in the darwin fork.