about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-08-01 16:31:38 -0400
committerJohn Ericson <Ericson2314@Yahoo.com>2017-08-03 16:37:27 -0400
commit2e61d8b71cb2f24fd71bb811f8a504451366f2e2 (patch)
treebdcb68e86cec4d0f319940b4a45aefdca9353c02 /pkgs/build-support
parent14e05c30e85f0e8bd8f51b49a2ea622df7172ec2 (diff)
downloadnixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.tar
nixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.tar.gz
nixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.tar.bz2
nixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.tar.lz
nixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.tar.xz
nixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.tar.zst
nixlib-2e61d8b71cb2f24fd71bb811f8a504451366f2e2.zip
cc-wrapper: Handle more -l.... gotchas
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
index ae920e4fdad1..9829179a97c4 100644
--- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
+++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
@@ -39,14 +39,17 @@ else
                 echo "cctools LD does not support '-L foo' or '-l foo'" >&2
                 exit 1
                 ;;
-            -lto_library)  allArgs+=("$1") ;;
-                # We aren't linking any "to_library"
-            -lSystem)      allArgs+=("$1") ;;
+            -lazy_library | -lazy_framework | -lto_library)
+                # We aren't linking any "azy_library", "to_library", etc.
+                allArgs+=("$1")
+                ;;
+            -lazy-l | -weak-l)    allArgs+=("$1") ;;
+                # We can't so easily prevent header issues from these.
+            -lSystem)             allArgs+=("$1") ;;
                 # Special case as indirection seems like a bad idea for something
                 # so fundamental. Can be removed for simplicity.
-            -l?*)          childrenLink+=("$1") ;;
-            -reexport-l?*) childrenLink+=("$1") ;;
-            *)             allArgs+=("$1") ;;
+            -l?* | -reexport-l?*) childrenLink+=("$1") ;;
+            *)                    allArgs+=("$1") ;;
         esac
 
         shift