Commits

james woodyatt committed d4c361f

When build OCaml mixed libraries with ocamlmklib, use absolute
paths with the -L option. Also, do not insert the TOOLSDIR/lib
directory by default.

Comments (0)

Files changed (1)

     extends $(Compiler)
     
     ### Variables
-    SEARCH=$(tools-lib-stage.DIR)
+    SEARCH=
     PACKAGES[]=
     PREDICATES[]=
     CFLAGS=-fPIC -Wall
     
     ### The verbose flag
     verbose-flag()=
-        #return $(if $(VERBOSE), -verbose, $(EMPTY))
-        return $(EMPTY)
+        return $(if $(VERBOSE), -verbose, $(EMPTY))
     
     ### Dependency scanner command driver
     protected.cmd-driver(cmd)=
     
     ### Driver
     DRIVER=ocamlmklib
-    SEARCH=$(tools-lib-stage.DIR)
+    SEARCH=
     SUPPORT[]=
     
     ### The verbose flag
     protected.verbose-flag()=
-        #return $(if $(VERBOSE), -verbose, $(EMPTY))
-        return $(EMPTY)
+        return $(if $(VERBOSE), -verbose, $(EMPTY))
     
     ### Linker search options
     protected.library-search()=
-        return $(addprefix -L, $(this.SEARCH))
+        return $(addprefix -L, $(absname $(this.SEARCH)))
     
     ### Linker reference options
     protected.library-ref()=
     
     ### The verbose flag
     verbose-flag()=
-        #return $(if $(VERBOSE), -v, $(EMPTY))
-        return $(EMPTY)
+        return $(if $(VERBOSE), -v, $(EMPTY))
     
     ### Composer options
     protected.composer-options(src, index)=
         foreach(r, $(this.LIBREFS))
             if $(r.MIXED)
                 search+=$(dir $(r.DIR)/$(config))
-        return $(tools-lib-stage.DIR) $(search)
+        return $(search)
     
     ### Apply configuration object
     protected.apply-configuration(configuration)=