colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9f1e009975
nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh

38 lines
1.4 KiB
Bash
Raw Normal View History

cc-wrapper: fix #10574: old gcc -> cc fallout The part with gcc-wrapper-old changes is rather unimportant, as it's almost unused but I still tested that the sole user `gnat` builds.
2016-02-05 10:59:18 +00:00
# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE"
* Some hackery to make sure that the Glibc headers appear *after* the libstdc++ headers in the header search path, otherwise libstdc++'s use of #include_next to include Glibc headers breaks. svn path=/nixpkgs/trunk/; revision=12195
2008-06-26 11:07:46 +00:00
cc-wrapper: Pass shellcheck and other cleanups In many cases, this involved taking @orivej's and @edolstra's recent ld-wrapper improvements, and applying then elsewhere.
2017-08-02 16:48:51 +00:00
# Export and assign separately in order that a failing $(..) will fail
# the script.
gcc-wrapper: Style fix
2014-10-10 12:25:23 +00:00
if [ -e @out@/nix-support/libc-cflags ]; then
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_CFLAGS_COMPILE
NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
* Some hackery to make sure that the Glibc headers appear *after* the libstdc++ headers in the header search path, otherwise libstdc++'s use of #include_next to include Glibc headers breaks. svn path=/nixpkgs/trunk/; revision=12195
2008-06-26 11:07:46 +00:00
fi
cc-wrapper: fix #10574: old gcc -> cc fallout The part with gcc-wrapper-old changes is rather unimportant, as it's almost unused but I still tested that the sole user `gnat` builds.
2016-02-05 10:59:18 +00:00
if [ -e @out@/nix-support/cc-cflags ]; then
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_CFLAGS_COMPILE
NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
* Some hackery to make sure that the Glibc headers appear *after* the libstdc++ headers in the header search path, otherwise libstdc++'s use of #include_next to include Glibc headers breaks. svn path=/nixpkgs/trunk/; revision=12195
2008-06-26 11:07:46 +00:00
fi
gcc-wrapper: Style fix
2014-10-10 12:25:23 +00:00
if [ -e @out@/nix-support/gnat-cflags ]; then
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_GNATFLAGS_COMPILE
NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE"
Merging the gnat-wrapper and gcc-wrapper into a single gcc-wrapper. (I will remove the gnat-wrapper files if this works, later) svn path=/nixpkgs/branches/stdenv-updates/; revision=19492
2010-01-16 21:32:44 +00:00
fi
gcc-wrapper: Style fix
2014-10-10 12:25:23 +00:00
if [ -e @out@/nix-support/libc-ldflags ]; then
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_LDFLAGS
NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)"
* Pass -rpath flags in the same order as -L flags. * Put the Glibc linker flags in front of the GCC linker flags. Needed for the stdenv-linux bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=13940
2009-02-01 21:26:28 +00:00
fi
cc-wrapper: fix #10574: old gcc -> cc fallout The part with gcc-wrapper-old changes is rather unimportant, as it's almost unused but I still tested that the sole user `gnat` builds.
2016-02-05 10:59:18 +00:00
if [ -e @out@/nix-support/cc-ldflags ]; then
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_LDFLAGS
NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
* Some hackery to make sure that the Glibc headers appear *after* the libstdc++ headers in the header search path, otherwise libstdc++'s use of #include_next to include Glibc headers breaks. svn path=/nixpkgs/trunk/; revision=12195
2008-06-26 11:07:46 +00:00
fi
gcc-wrapper: Style fix
2014-10-10 12:25:23 +00:00
if [ -e @out@/nix-support/libc-ldflags-before ]; then
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_@infixSalt@_LDFLAGS_BEFORE
NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE"
* Some hackery to make sure that the Glibc headers appear *after* the libstdc++ headers in the header search path, otherwise libstdc++'s use of #include_next to include Glibc headers breaks. svn path=/nixpkgs/trunk/; revision=12195
2008-06-26 11:07:46 +00:00
fi
cc-wrapper: Unconditionally use @infixSalt@ accross the board 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`
2017-06-26 04:43:06 +00:00
export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1
Reference in New Issue Copy Permalink