diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-28 14:56:08 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:08:18 -0500 |
| commit | 8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd (patch) | |
| tree | 1f981fdaa6de98e84214b0feb76795812dbfe10f /pkgs/build-support/cc-wrapper/add-flags.sh | |
| parent | 4f869bccc14fb2fa19df130e76c022765ecda924 (diff) | |
| download | nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.tar nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.tar.gz nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.tar.bz2 nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.tar.lz nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.tar.xz nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.tar.zst nixlib-8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd.zip | |
bintools-wrapper: Init
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.
Diffstat (limited to 'pkgs/build-support/cc-wrapper/add-flags.sh')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 978041fb4d87..d8b42244607a 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -10,15 +10,8 @@ var_templates_list=( NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK NIX+GNATFLAGS_COMPILE - NIX+IGNORE_LD_THROUGH_GCC - NIX+LDFLAGS - NIX+LDFLAGS_BEFORE - NIX+LDFLAGS_AFTER ) - var_templates_bool=( - NIX+SET_BUILD_ID - NIX+DONT_SET_RPATH NIX+ENFORCE_NO_NATIVE ) @@ -62,17 +55,9 @@ if [ -e @out@/nix-support/gnat-cflags ]; then NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" fi -if [ -e @out@/nix-support/libc-ldflags ]; then - NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" -fi - if [ -e @out@/nix-support/cc-ldflags ]; then NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi -if [ -e @out@/nix-support/libc-ldflags-before ]; then - NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" -fi - # That way forked processes will not extend these environment variables again. export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 |