Always use libev if detected

Part of #601.
ocsigen · Apr 1, 2020 · e9a9c7b · e9a9c7b
1 parent ee466e2
commit e9a9c7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -200,10 +200,6 @@ matrix:
 
   fast_finish: true
 
-env:
-  global:
-    - LWT_FORCE_LIBEV_BY_DEFAULT=yes
-
 notifications:
   email:
     on_success: always

diff --git a/src/unix/config/discover.ml b/src/unix/config/discover.ml
@@ -850,22 +850,11 @@ let () =
 
     (* Write lwt_features.ml. *)
     let libev_default =
-      try
-        Sys.getenv "LWT_FORCE_LIBEV_BY_DEFAULT" = "yes"
-      with Not_found ->
-        match !Arguments.libev_default with
-        | Some argument ->
-          argument
-        | None ->
-          match Configurator.ocaml_config_var_exn context "system" with
-          | "linux"
-          | "linux_elf"
-          | "linux_aout"
-          | "linux_eabi"
-          | "linux_eabihf" ->
-            true
-          | _ ->
-            false
+      match !Arguments.libev_default with
+      | Some argument ->
+        argument
+      | None ->
+        true
     in
     Output.write_ml_file
       ~extra:[