Enable native code compilation when ocamlopt is available.

[whenjobs.git] / daemon / whenjobsd.ml

diff --git a/daemon/whenjobsd.ml b/daemon/whenjobsd.ml
index 1efde6c..3028503 100644 (file)
--- a/daemon/whenjobsd.ml
+++ b/daemon/whenjobsd.ml
@@ -126,11 +126,12 @@ Options:
   Syslog.notice "daemon started: version=%s uid=%d home=%s"
     Config.package_version euid home;
 
   Syslog.notice "daemon started: version=%s uid=%d home=%s"
     Config.package_version euid home;
 

-  (* If there is a jobs.cmo file, load it. *)
+  (* If there is a jobs.cmo/jobs.cmxs file, load it. *)

   let () =
   let () =

-    let file = sprintf "%s/jobs.cmo" jobsdir in
+    let suffix = if not Dynlink.is_native then "cmo" else "cmxs" in
+    let file = sprintf "%s/jobs.%s" jobsdir suffix in

     if Sys.file_exists file then
     if Sys.file_exists file then

-      try Daemon.reload_file () with Failure _ -> () in
+      try Daemon.reload_files () with Failure _ -> () in

 
   (* Go into main loop. *)
   Daemon.main_loop ()
 
   (* Go into main loop. *)
   Daemon.main_loop ()