diff options
author | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-03-03 15:37:51 +0000 |
---|---|---|
committer | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-03-03 15:37:51 +0000 |
commit | 2c134e3dcf7cb76fd6a90434fc885be2315b9ae9 (patch) | |
tree | ee1ac1c92694e864e53caca9382747fe7451433e /configure | |
parent | 86fbc7e8d59311cc18818616c18d6fca39e0ecda (diff) | |
parent | c24198550aab88f105db94a101cf189aa701bbe1 (diff) | |
download | ocaml-2c134e3dcf7cb76fd6a90434fc885be2315b9ae9.tar.gz |
Merge commit 'c24198550aab88f105db94a101cf189aa701bbe1' into parallel_minor_gc_4_12
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -12631,21 +12631,23 @@ fi case $ocaml_cv_cc_vendor in #( xlc-*) : - outputobj='-o $(EMPTY)'; gcc_warnings="-qflag=i:i" ;; #( + outputobj='-o $(EMPTY)' + warn_error_flag='' + cc_warnings='-qflag=i:i' ;; #( # all warnings enabled msvc-*) : outputobj='-Fo' warn_error_flag='-WX' - gcc_warnings='' ;; #( + cc_warnings='' ;; #( *) : outputobj='-o $(EMPTY)' warn_error_flag='-Werror' - gcc_warnings='-Wall -Wdeclaration-after-statement' ;; + cc_warnings='-Wall -Wdeclaration-after-statement' ;; esac case $enable_warn_error,4.12.0+multicore+dev0-2020-04-22 in #( yes,*|,*+dev*|,*+multicore*) : - gcc_warnings="$gcc_warnings $warn_error_flag" ;; #( + cc_warnings="$cc_warnings $warn_error_flag" ;; #( *) : ;; esac @@ -12671,7 +12673,7 @@ case $host in #( gcc-[01234]-*) : as_fn_error $? "This version of Mingw GCC is too old. Please use GCC version 5 or above." "$LINENO" 5 ;; #( gcc-*) : - internal_cflags="-Wno-unused $gcc_warnings \ + internal_cflags="-Wno-unused $cc_warnings \ -fexcess-precision=standard" # TODO: see whether the code can be fixed to avoid -Wno-unused common_cflags="-O2 -fno-strict-aliasing -fwrapv -mms-bitfields" @@ -12685,7 +12687,7 @@ esac ;; #( case $ocaml_cv_cc_vendor in #( clang-*) : common_cflags="-O2 -fno-strict-aliasing -fwrapv"; - internal_cflags="$gcc_warnings -fno-common" ;; #( + internal_cflags="$cc_warnings -fno-common" ;; #( gcc-[012]-*) : # Some versions known to miscompile OCaml, e,g, 2.7.2.1, some 2.96. # Plus: C99 support unknown. @@ -12698,29 +12700,29 @@ $as_echo "$as_me: WARNING: This version of GCC is rather old. Reducing optimizat { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Consider using GCC version 4.2 or above." >&5 $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; common_cflags="-std=gnu99 -O"; - internal_cflags="$gcc_warnings" ;; #( + internal_cflags="$cc_warnings" ;; #( gcc-4-[234]) : # No -fexcess-precision option before GCC 4.5 common_cflags="-std=gnu99 -O2 -fno-strict-aliasing -fwrapv \ -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( + internal_cflags="$cc_warnings" ;; #( gcc-4-*) : common_cflags="-std=gnu99 -O2 -fno-strict-aliasing -fwrapv \ -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings -fexcess-precision=standard" ;; #( + internal_cflags="$cc_warnings -fexcess-precision=standard" ;; #( gcc-*) : common_cflags="-O2 -fno-strict-aliasing -fwrapv"; - internal_cflags="$gcc_warnings -fno-common \ + internal_cflags="$cc_warnings -fno-common \ -fexcess-precision=standard" ;; #( msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD $gcc_warnings" + common_cflags="-nologo -O2 -Gy- -MD $cc_warnings" common_cppflags="-D_CRT_SECURE_NO_DEPRECATE" internal_cppflags='-DUNICODE -D_UNICODE' internal_cppflags="$internal_cppflags -DWINDOWS_UNICODE=" internal_cppflags="${internal_cppflags}\$(WINDOWS_UNICODE)" ;; #( xlc-*) : common_cflags="-O5 -qtune=balanced -qnoipa -qinline $CFLAGS"; - internal_cflags="$gcc_warnings" ;; #( + internal_cflags="$cc_warnings" ;; #( *) : common_cflags="-O" ;; esac ;; |