From d0def70897b20a31abd91fb7818896224341b4b4 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 26 May 2021 16:41:15 +0000 Subject: build system: ccenv_set_cc_underscore(): rewrite against strict posix utils. --- sofort/ccenv/ccenv.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index 2ba9426..14e8b9a 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -741,16 +741,26 @@ ccenv_set_cc_underscore() ccenv_fn_name='ZmYaXyWbVe_UuTnSdReQrPsOcNoNrLe' ccenv_fn_code='int %s(void){return 0;}' - if printf "$ccenv_fn_code" $ccenv_fn_name \ - | $ccenv_cc -xc - -S -o - \ - 2>&3 \ - | grep "^_$ccenv_fn_name:" \ - > /dev/null; then + ccenv_tmpname='ccenv/c3RyaWN0X21vZGUK.c' + + printf "$ccenv_fn_code" $ccenv_fn_name \ + > "$ccenv_tmpname" + + $ccenv_cc -c "$ccenv_tmpname" -o a.out \ + > /dev/null 2>&3 + + if "$ccenv_nm" a.out | grep \ + -e "^_$ccenv_fn_name" \ + -e " _$ccenv_fn_name" \ + > /dev/null; then ccenv_cc_underscore='_' ccenv_attr_epilog 'yes' + else + ccenv_attr_epilog 'no' fi - ccenv_attr_epilog 'no' + rm "$ccenv_tmpname" + rm a.out return 0 } -- cgit v1.2.3