about summary refs log tree commit diff
path: root/pkgs/build-support/cc-wrapper
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-11 19:10:10 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-11 19:12:28 -0500
commit45d4b27d025ec71adc1218bcb2c02e50bcc08492 (patch)
tree1b5b7dcc1f65ce11b383017b25d40a030b1f551c /pkgs/build-support/cc-wrapper
parent4e4520a0f33fba9f2109f2991d0ed4a3bd328746 (diff)
downloadnixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.tar
nixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.tar.gz
nixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.tar.bz2
nixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.tar.lz
nixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.tar.xz
nixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.tar.zst
nixlib-45d4b27d025ec71adc1218bcb2c02e50bcc08492.zip
cc-wrapper: GNAT wrapper stop caring about `-m32`
It need not concern itself with 32-bit dynamic linking; ld-wrapper handles that now.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r--pkgs/build-support/cc-wrapper/gnat-wrapper.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index 7a0eb28be636..0ac8f313ea18 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -36,10 +36,6 @@ for i in "$@"; do
         dontLink=1
     elif [ "${i:0:1}" != - ]; then
         nonFlagArgs=1
-    elif [ "$i" = -m32 ]; then
-        if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
-        fi
     fi
 done