# HG changeset patch # User Tassilo Philipp # Date 1662298093 -7200 # Node ID 7e00c173519d3bfc5187c2a92578eacfcb99f149 # Parent 4a3fab7712fbd5c6767e9b4b682808f7d98688f8 - test/dynload_plain: make build deduce native libc to use for testing from more elemental tool (using [(1) now instead of ls(1), reason is that on some x64 sunos platforms, ls is 32bit; yes, hacky fix) diff -r 4a3fab7712fb -r 7e00c173519d test/dynload_plain/Makefile.embedded --- a/test/dynload_plain/Makefile.embedded Sun Sep 04 14:29:12 2022 +0200 +++ b/test/dynload_plain/Makefile.embedded Sun Sep 04 15:28:13 2022 +0200 @@ -3,8 +3,8 @@ # and thus not override previously set var; in a similar vein, the :sh line works on # sun make flavors and sets the var using sunOS specific deduction if not already set # (:sh also works on bmake, but != already sets the var) -DEF_C_DYLIB=$(shell ((ldd `which ls` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1) -DEF_C_DYLIB!=((ldd `which ls` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1 +DEF_C_DYLIB=$(shell ((ldd `which [` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1) +DEF_C_DYLIB!=((ldd `which [` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1 DEF_C_DYLIB:sh=[ -z "${DEF_C_DYLIB}" ] && ls /lib/`isainfo -b`/libc.so || echo "${DEF_C_DYLIB}" APP = dynload_plain diff -r 4a3fab7712fb -r 7e00c173519d test/dynload_plain/Makefile.generic --- a/test/dynload_plain/Makefile.generic Sun Sep 04 14:29:12 2022 +0200 +++ b/test/dynload_plain/Makefile.generic Sun Sep 04 15:28:13 2022 +0200 @@ -3,8 +3,8 @@ # and thus not override previously set var; in a similar vein, the :sh line works on # sun make flavors and sets the var using sunOS specific deduction if not already set # (:sh also works on bmake, but != already sets the var) -DEF_C_DYLIB=$(shell ((ldd `which ls` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1) -DEF_C_DYLIB!=((ldd `which ls` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1 +DEF_C_DYLIB=$(shell ((ldd `which [` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1) +DEF_C_DYLIB!=((ldd `which [` | grep -o '/.*/libc.so[^ ]*' || ls /lib*/libc.so* || ls /usr/lib/libc.so*) | grep -v '\.a$$' | (sort -V -r || sort -t . -n -k 2)) 2>/dev/null | head -1 DEF_C_DYLIB:sh=[ -z "${DEF_C_DYLIB}" ] && ls /lib/`isainfo -b`/libc.so || echo "${DEF_C_DYLIB}" APP = dynload_plain