diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-24 14:45:15 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-24 14:48:26 +0200 |
| commit | aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f (patch) | |
| tree | 05c1aabf3f255b517460f04570fa48012dcb71ad /pkgs/build-support | |
| parent | 6669a3b47711dc967df0ea8ff93fa9857aad015d (diff) | |
| download | nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.tar nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.tar.gz nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.tar.bz2 nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.tar.lz nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.tar.xz nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.tar.zst nixlib-aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f.zip | |
cc-wrapper/ld-wrapper: Minor speedup in string concatenation
There is still a O(n) pattern match in ld-wrapper, so we should probably rewrite that code to use associative arrays.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 6 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/ld-wrapper.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 3ccdc34db5b2..99eb63f40edf 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -55,7 +55,7 @@ while [ $n -lt ${#params[*]} ]; do nonFlagArgs=1 elif [ "$p" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + NIX_LDFLAGS+=" -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" fi fi n=$((n + 1)) @@ -111,9 +111,9 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + NIX_CFLAGS_COMPILE+=" ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" fi - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" + NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK" fi LD=@ldPath@/ld diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 056cfa920535..4b3906a2e10f 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -79,7 +79,7 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then case $libPath in *\ $path\ *) return 0 ;; esac - libPath="$libPath $path " + libPath+=" $path " } addToRPath() { @@ -90,12 +90,12 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then case $rpath in *\ $1\ *) return 0 ;; esac - rpath="$rpath $1 " + rpath+=" $1 " } libs="" addToLibs() { - libs="$libs $1" + libs+=" $1" } rpath="" |