Skip to content
Snippets Groups Projects
Commit 3450b5ca authored by Markus Blatt's avatar Markus Blatt
Browse files

[dunecontrol,bugfix] Fixes erroring out during multiarch detection.


This patch moves the "set +e" command to the correct location during
detection of the multiarch variable. That is is before any
$CXX --print-multiarch call. Now dunecontrol will not fail for compilers
not supporting it.
(cherry picked from commit 503ec712)

Signed-off-by: default avatarMarkus Blatt <markus@dr-blatt.de>
parent 08d193fc
No related branches found
No related tags found
No related merge requests found
......@@ -222,6 +222,7 @@ fi
# according to it.
# If not compiler is specified then cc or gcc is used.
extract_multiarch(){
set +e #error in the multiarch detection should not be fatal.
local my_cxx_compiler
if test "x$MULTIARCH_LIBDIR" != "x"; then
return
......@@ -235,7 +236,6 @@ extract_multiarch(){
my_cxx_compiler=`echo $CONFIGURE_FLAGS | $GREP CXX| $SED "s/.*CXX=[\"']\?\([^$BLANK'\"]*\)[\"']\?.*/\1/"`
fi
if test "x$my_cxx_compiler" == "x"; then
set +e #error in the multiarch detection should not be fatal.
$(which cc &>/dev/null)
if test $? -eq "0"; then
my_cxx_compiler=cc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment