diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2006-10-18 08:21:24 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2006-10-18 08:21:24 +0000 |
| commit | 35d863e204eb61c4d7c1b141e6c6b9a4172dceb0 (patch) | |
| tree | f950ba5e28853d0fbf7ca89f91e8f4f50d282d0d /config | |
| parent | 741d1e70781e74a523e3a142ec6176422671c8c1 (diff) | |
Utiliser link /lib comme partial linker sous Windows/MSVC; adapter versions Unix et Windows/Mingw en consequence
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7696 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.mingw | 2 | ||||
| -rw-r--r-- | config/Makefile.msvc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 784db9d65..013351c75 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -100,7 +100,7 @@ NATIVECCLINKOPTS= ### Build partially-linked object file PARTIALLD=ld -r $(NATIVECCLINKOPTS) -PACKLD=$(PARTIALLD) +PACKLD=$(PARTIALLD) -o #there must be a space after this '-o' ############# Configuration for the contributed libraries diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 017e98275..6a17c5a1b 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -105,8 +105,8 @@ NATIVECCCOMPOPTS=/Ox /MT NATIVECCLINKOPTS=/MT ### Build partially-linked object file -PARTIALLD=lib /nologo -PACKLD=ld -r --oformat pe-i386 +PARTIALLD=link /lib /nologo +PACKLD=link /lib /nologo /out:# there must be no space after this '/out:' ############# Configuration for the contributed libraries |