diff --git a/bin/dunecontrol b/bin/dunecontrol index 2aa3ab4d7efcbeadb6e7484d811532de669b81e0..833a73b8f4e85147cd0a880d50702e97f5b3f49c 100755 --- a/bin/dunecontrol +++ b/bin/dunecontrol @@ -244,7 +244,10 @@ extract_multiarch(){ fi multiarch=$($my_cxx_compiler --print-multiarch 2>/dev/null) if test $? -gt 0; then - multiarch=$($my_cxx_compiler -v 2>&1| $GREP target | $SED "s/.*target=\([a-z0-9_-]*\)/\1/") + for i in "target=" "Target:"; do + multiarch=$($my_cxx_compiler -v 2>&1| $GREP "$i" | $SED "s/.*$i[$BLANK]*\([a-z0-9_-]*\)/\1/" | $SED "s/-[a-z]*-linux-gnu/-linux-gnu/") + if test -n "$multiarch"; then break; fi + done fi set -e # set to old value. export MULTIARCH_LIBDIR="lib/$multiarch" diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib index e196749d39f735ea2ab6c4e9319c5aacbfdfe049..e98ba2cafe3b51c1bc788083350d76fcdecae62a 100644 --- a/lib/dunemodules.lib +++ b/lib/dunemodules.lib @@ -171,7 +171,10 @@ extract_multiarch_pkg_config_path(){ fi multiarch=$($my_cxx_compiler --print-multiarch 2>/dev/null) if test $? -gt 0; then - multiarch=$($my_cxx_compiler -v 2>&1| $GREP target | sed "s/.*target=\([a-z0-9_-]*\)/\1/") + for i in "target=" "Target:"; do + multiarch=$($my_cxx_compiler -v 2>&1| $GREP "$i" | sed "s/.*$i[$BLANK]*\([a-z0-9_-]*\)/\1/" | $SED "s/-[a-z]*-linux-gnu/-linux-gnu/") + if test -n "$multiarch"; then break; fi + done fi set -e # set to old value. export MULTIARCH_LIBDIR="lib/$multiarch"