aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-11-26 19:52:13 +0100
committerEmilio Jesus Gallego Arias2019-11-26 19:52:13 +0100
commitde87f51f4d1de23831c1eced827b91a3628c5dd5 (patch)
tree327c6a60623fbc3e1e6e62ee26df6876c89a7319
parent87d4a5569ad917f2e9b57d582386074ba51b62fc (diff)
parentf052f19f4b6f2603daebe5e6eae9daffd9cc008c (diff)
Merge PR #11179: Fix Windows 32 bit build
Ack-by: JasonGross Ack-by: SkySkimmer Reviewed-by: ejgallego Ack-by: erikmd Ack-by: silene
-rw-r--r--configure.ml10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ml b/configure.ml
index 60ba8b1101..d4521a7872 100644
--- a/configure.ml
+++ b/configure.ml
@@ -919,16 +919,16 @@ let datadir,datadirsuffix = let (_,_,d,s) = select "DATADIR" in d,s
let cflags_dflt = "-Wall -Wno-unused -g -O2 -fexcess-precision=standard"
-let cflags_sse2 = ["-msse2"; "-mfpmath=sse"]
+let cflags_sse2 = "-msse2 -mfpmath=sse"
let cflags, sse2_math =
let _, slurp =
(* Test SSE2_MATH support <https://stackoverflow.com/a/45667927> *)
- tryrun "cc" (["-march=native"; "-dM"; "-E"]
- @ cflags_sse2
- @ [coqtop/"kernel/byterun/coq_interp.h"] (* any file *)) in
+ tryrun camlexec.find
+ ["ocamlc"; "-ccopt"; cflags_dflt ^ " -march=native -dM -E " ^ cflags_sse2;
+ "-c"; coqtop/"dev/header.c"] in (* any file *)
if List.exists (fun line -> starts_with line "#define __SSE2_MATH__ 1") slurp
- then (cflags_dflt ^ " " ^ String.concat " " cflags_sse2, true)
+ then (cflags_dflt ^ " " ^ cflags_sse2, true)
else (cflags_dflt, false)
(** Test at configure time that no harmful double rounding seems to