strip the unwanted darwin paths in configure.

This commit is contained in:
Kalamatee 2021-01-21 05:56:59 +00:00 committed by deadwood
parent fed971198e
commit 8990a9709f
2 changed files with 32 additions and 4 deletions

17
configure vendored
View File

@ -5179,7 +5179,6 @@ re-running configure" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOC" >&5
$as_echo "$LOC" >&6; }
aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe"
aros_host_arch="darwin"
host_cc_elf=no
if [ -z ${SED+x} ]; then SED="gsed"; fi
@ -5203,8 +5202,22 @@ $as_echo "$as_me: WARNING: \"Unknown CPU for Darwin host -- $host_cpu\"" >&2;}
;;
esac
aros_host_ldflags="$aros_host_ldflags -liconv"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include/||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include/||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include/||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include||g'`"
aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib/||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib/||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib/||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib||g'`"
aros_host_ldflags="$aros_host_ldflags -liconv"
;;
dragonfly*)

View File

@ -352,7 +352,6 @@ case "$host_os" in
please run 'xcode-select --install' before
re-running configure])])
AC_MSG_RESULT($LOC)
aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe"
aros_host_arch="darwin"
host_cc_elf=no
if [[ -z ${SED+x} ]]; then SED="gsed"; fi
@ -375,8 +374,24 @@ re-running configure])])
;;
esac
aros_host_ldflags="$aros_host_ldflags -liconv"
dnl Strip out the unsupported include paths...
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include/||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/usr/local/include||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include/||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/local/include||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include/||g'`"
aros_host_cflags="`echo "$aros_host_cflags" | sed 's|-I/opt/pkg/include||g'`"
aros_host_cflags="$aros_host_cflags $aros_host_cc_pipe"
dnl Strip out the unsupported library paths...
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib/||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/usr/local/lib||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib/||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/local/lib||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib/||g'`"
aros_host_ldflags="`echo "$aros_host_ldflags" | sed 's|-L/opt/pkg/lib||g'`"
aros_host_ldflags="$aros_host_ldflags -liconv"
;;
dragonfly*)