configure: don't check for Flambda

This is best handled by Dune in the future. Flambda itself is
experimental, and proper Flambda options support will be implemented
after Flambda is stabilized.

.travis.yml

@@ -11,11 +11,11 @@ matrix:
     - os: linux
       env: COMPILER=4.04
     - os: linux
-      env: COMPILER=4.05 FLAMBDA=yes
+      env: COMPILER=4.05
     - os: linux
-      env: COMPILER=4.06 FLAMBDA=yes
+      env: COMPILER=4.06
     - os: linux
-      env: COMPILER=4.06 FLAMBDA=yes LIBEV=no
+      env: COMPILER=4.06 LIBEV=no
     - os: linux
       env: COMPILER=4.07
     - os: osx

Makefile

@@ -79,7 +79,7 @@ clean:
 	dune clean
 	find . -name '.merlin' | xargs rm -f
 	rm -fr docs/api
-	rm -f src/jbuild-ignore src/unix/lwt_config src/core/flambda.flag
+	rm -f src/jbuild-ignore src/unix/lwt_config
 	for TEST in `ls -d test/packaging/*/*` ; \
 	do \
 	    make -wC $$TEST clean ; \

src/core/dune

@@ -4,6 +4,5 @@
  (synopsis "Monadic promises and concurrent I/O")
  (wrapped false)
  (preprocess (pps bisect_ppx -conditional))
- (ocamlopt_flags (:standard (:include flambda.flag)))
  (libraries bytes result)
  (flags (:standard -w +A-29)))

src/unix/config/configure.ml

@@ -39,26 +39,7 @@ let main () =
   print "use_pthread" !use_pthread;
   print "android_target" !android_target;
   print "libev_default" !libev_default;
-  close_out f;
-
-  (* Compilers starting from 4.03.0 support the -O3 flag. *)
-  let () =
-    let major, minor =
-      Scanf.sscanf Sys.ocaml_version "%u.%u"
-        (fun major minor -> major, minor)
-    in
-    let supports_o3 = (major, minor) >= (4, 3) in
-    let flags_file = open_out "src/core/flambda.flag" in
-    begin
-      if supports_o3 then
-        output_string flags_file "-O3\n"
-      else
-        output_string flags_file "()\n"
-    end;
-    close_out flags_file
-  in
-
-  ()
+  close_out f
 
 let () =
   main ()

src/util/travis.sh

@@ -99,12 +99,7 @@ case $COMPILER in
        *) echo Unsupported compiler $COMPILER; exit 1;;
 esac
 
-if [ "$FLAMBDA" = yes ]
-then
-    SWITCH="$OCAML_VERSION+flambda"
-else
-    SWITCH="$OCAML_VERSION"
-fi
+SWITCH="$OCAML_VERSION"
 
 if [ -n "$DO_SWITCH" ]
 then

test/core/dune

@@ -1,6 +1,5 @@
 (executable
  (name main)
- (ocamlopt_flags (:standard (:include ../../src/core/flambda.flag)))
  (libraries lwttester)
  (flags (:standard -w +A-40-42)))