Skip to content

Commit 7688c46

Browse files
committed
Boostrap with changes in auto conf scripts
1 parent bace2ff commit 7688c46

File tree

1 file changed

+76
-47
lines changed

1 file changed

+76
-47
lines changed

configure

+76-47
Original file line numberDiff line numberDiff line change
@@ -2634,6 +2634,53 @@ fi
26342634

26352635
} # ac_fn_cxx_try_run
26362636

2637+
# ac_fn_cxx_try_link LINENO
2638+
# -------------------------
2639+
# Try to link conftest.$ac_ext, and return whether this succeeded.
2640+
ac_fn_cxx_try_link ()
2641+
{
2642+
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2643+
rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
2644+
if { { ac_try="$ac_link"
2645+
case "(($ac_try" in
2646+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2647+
*) ac_try_echo=$ac_try;;
2648+
esac
2649+
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2650+
printf "%s\n" "$ac_try_echo"; } >&5
2651+
(eval "$ac_link") 2>conftest.err
2652+
ac_status=$?
2653+
if test -s conftest.err; then
2654+
grep -v '^ *+' conftest.err >conftest.er1
2655+
cat conftest.er1 >&5
2656+
mv -f conftest.er1 conftest.err
2657+
fi
2658+
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2659+
test $ac_status = 0; } && {
2660+
test -z "$ac_cxx_werror_flag" ||
2661+
test ! -s conftest.err
2662+
} && test -s conftest$ac_exeext && {
2663+
test "$cross_compiling" = yes ||
2664+
test -x conftest$ac_exeext
2665+
}
2666+
then :
2667+
ac_retval=0
2668+
else $as_nop
2669+
printf "%s\n" "$as_me: failed program was:" >&5
2670+
sed 's/^/| /' conftest.$ac_ext >&5
2671+
2672+
ac_retval=1
2673+
fi
2674+
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2675+
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2676+
# interfere with the next link command; also delete a directory that is
2677+
# left behind by Apple's compiler. We do this before executing the actions.
2678+
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2679+
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2680+
as_fn_set_status $ac_retval
2681+
2682+
} # ac_fn_cxx_try_link
2683+
26372684
# ac_fn_c_try_link LINENO
26382685
# -----------------------
26392686
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -2814,53 +2861,6 @@ fi
28142861

28152862
} # ac_fn_cxx_try_cpp
28162863

2817-
# ac_fn_cxx_try_link LINENO
2818-
# -------------------------
2819-
# Try to link conftest.$ac_ext, and return whether this succeeded.
2820-
ac_fn_cxx_try_link ()
2821-
{
2822-
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2823-
rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
2824-
if { { ac_try="$ac_link"
2825-
case "(($ac_try" in
2826-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2827-
*) ac_try_echo=$ac_try;;
2828-
esac
2829-
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2830-
printf "%s\n" "$ac_try_echo"; } >&5
2831-
(eval "$ac_link") 2>conftest.err
2832-
ac_status=$?
2833-
if test -s conftest.err; then
2834-
grep -v '^ *+' conftest.err >conftest.er1
2835-
cat conftest.er1 >&5
2836-
mv -f conftest.er1 conftest.err
2837-
fi
2838-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2839-
test $ac_status = 0; } && {
2840-
test -z "$ac_cxx_werror_flag" ||
2841-
test ! -s conftest.err
2842-
} && test -s conftest$ac_exeext && {
2843-
test "$cross_compiling" = yes ||
2844-
test -x conftest$ac_exeext
2845-
}
2846-
then :
2847-
ac_retval=0
2848-
else $as_nop
2849-
printf "%s\n" "$as_me: failed program was:" >&5
2850-
sed 's/^/| /' conftest.$ac_ext >&5
2851-
2852-
ac_retval=1
2853-
fi
2854-
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2855-
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2856-
# interfere with the next link command; also delete a directory that is
2857-
# left behind by Apple's compiler. We do this before executing the actions.
2858-
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2859-
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2860-
as_fn_set_status $ac_retval
2861-
2862-
} # ac_fn_cxx_try_link
2863-
28642864
# ac_fn_f77_try_link LINENO
28652865
# -------------------------
28662866
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -26608,6 +26608,32 @@ fi
2660826608
;; #(
2660926609
clang) :
2661026610

26611+
OLD_ACSM_LDFLAGS="$ACSM_LDFLAGS"
26612+
ACSM_LDFLAGS+=" -Wl,-femit-dwarf-unwind=always -Wl,-no_compact_unwind"
26613+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
26614+
/* end confdefs.h. */
26615+
26616+
void main(int argc, char **argv)
26617+
{
26618+
std::cout << "Hello World!" << std::endl;
26619+
}
26620+
26621+
_ACEOF
26622+
if ac_fn_cxx_try_link "$LINENO"
26623+
then :
26624+
26625+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<<Disabling compact unwinding" >&5
26626+
printf "%s\n" "<<<Disabling compact unwinding" >&6; }
26627+
26628+
else $as_nop
26629+
26630+
ACSM_LDFLAGS="$OLD_ACSM_LDFLAGS"
26631+
26632+
fi
26633+
rm -f core conftest.err conftest.$ac_objext conftest.beam \
26634+
conftest$ac_exeext conftest.$ac_ext
26635+
26636+
2661126637
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O2 -felide-constructors -Qunused-arguments -Wunused-parameter -Wunused"
2661226638
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -O2 -felide-constructors -g -pedantic -W -Wall -Wextra -Wno-long-long"
2661326639
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -Wunused-parameter -Wunused -Wpointer-arith -Wformat -Wparentheses -Wuninitialized -Qunused-arguments -Woverloaded-virtual -fno-limit-debug-info"
@@ -26865,6 +26891,8 @@ fi
2686526891
CFLAGS_DEVEL="$ACSM_CFLAGS_DEVEL"
2686626892
CFLAGS_DBG="$ACSM_CFLAGS_DBG"
2686726893

26894+
LDFLAGS+=" $ACSM_LDFLAGS"
26895+
2686826896
ASSEMBLY_FLAGS="$ACSM_ASSEMBLY_FLAGS"
2686926897
NODEPRECATEDFLAG="$ACSM_NODEPRECATEDFLAG"
2687026898
OPROFILE_FLAGS="$ACSM_OPROFILE_FLAGS"
@@ -64421,6 +64449,7 @@ esac
6442164449

6442264450
printf "%s\n"
6442364451
done
64452+
printf "%s\n" "LDFLAGS............................ : $LDFLAGS"
6442464453
printf "%s\n" "Any warnings-to-errors flags....... : $ACSM_ANY_WERROR_FLAG"
6442564454
printf "%s\n" "Any extra paranoid warning flags... : $ACSM_ANY_PARANOID_FLAGS"
6442664455
printf "%s\n" "Install dir........................ : $prefix"

0 commit comments

Comments
 (0)