Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: move the definition of syslib from ocamlmklibconfig.ml to ocamlmklib.ml

master
Sébastien Hinderer 2018-10-22 10:00:19 +02:00
parent 206442489b
commit 04d24edec0
6 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/Makefile.mingw
View File

@ -164,7 +164,6 @@ MKLIB=rm -f $(1) && $(TOOLPREF)ar rcs $(1) $(2)
### Canonicalize the name of a system library
SYSLIB=-l$(1)
#ml let syslib x = "-l"^x;;
### The ranlib command
RANLIB=$(TOOLPREF)ranlib

1
config/Makefile.mingw64
View File

@ -164,7 +164,6 @@ MKLIB=rm -f $(1) && $(TOOLPREF)ar rcs $(1) $(2)
### Canonicalize the name of a system library
SYSLIB=-l$(1)
#ml let syslib x = "-l"^x;;
### The ranlib command
RANLIB=$(TOOLPREF)ranlib

1
config/Makefile.msvc
View File

@ -159,7 +159,6 @@ MKSHAREDLIBRPATH=
### Canonicalize the name of a system library
SYSLIB=$(1).lib
#ml let syslib x = x ^ ".lib";;
### The ranlib command
RANLIB=echo

1
config/Makefile.msvc64
View File

@ -162,7 +162,6 @@ MKSHAREDLIBRPATH=
### Canonicalize the name of a system library
SYSLIB=$(1).lib
#ml let syslib x = x ^ ".lib";;
### The ranlib command
RANLIB=echo

1
configure vendored
View File

@ -1984,7 +1984,6 @@ config MKSHAREDLIBRPATH "$mksharedlibrpath"
config NATDYNLINKOPTS "$natdynlinkopts"
cat >> ${conffile} <<EOF
SYSLIB=-l\$(1)
#ml let syslib x = "-l"^x;;
### How to build a static library
MKLIB=rm -f \$(1) && ${TOOLPREF}ar rc \$(1) \$(2) && ${TOOLPREF}ranlib \$(1)

3
tools/ocamlmklib.ml
View File

@ -16,6 +16,9 @@
open Printf
open Ocamlmklibconfig
let syslib x =
if Config.ccomp_type = "msvc" then x ^ ".lib" else "-l" ^ x
(* PR#4783: under Windows, don't use absolute paths because we do
not know where the binary distribution will be installed. *)
let compiler_path name =