summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1996-11-07 11:01:32 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1996-11-07 11:01:32 +0000
commit48092f6ea28370be487cbb6d233d4693db4c4d01 (patch)
tree212ba37e1483bd36156150f10571846db2766d49 /utils
parente12a8d1fd55ae5b99f79bcb3e713806fe5149cfc (diff)
downloadocaml-48092f6ea28370be487cbb6d233d4693db4c4d01.tar.gz
clflags: ajout option -output-obj
config: ajout variable ranlib. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1174 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'utils')
-rw-r--r--utils/clflags.ml2
-rw-r--r--utils/config.mli2
-rw-r--r--utils/config.mlp3
3 files changed, 5 insertions, 2 deletions
diff --git a/utils/clflags.ml b/utils/clflags.ml
index 8a22cee450..160f59117e 100644
--- a/utils/clflags.ml
+++ b/utils/clflags.ml
@@ -19,12 +19,14 @@ and ccobjs = ref ([] : string list) (* .o, .a and -lxxx files *)
let compile_only = ref false (* -c *)
and exec_name = ref "a.out" (* -o *)
and archive_name = ref "library.cma" (* -o *)
+and object_name = ref ("camlprog" ^ Config.ext_obj) (* -o *)
and include_dirs = ref ([] : string list)(* -I *)
and print_types = ref false (* -i *)
and make_archive = ref false (* -a *)
and fast = ref false (* -unsafe *)
and link_everything = ref false (* -linkall *)
and custom_runtime = ref false (* -custom *)
+and output_c_object = ref false (* -output-obj *)
and ccopts = ref ([] : string list) (* -ccopt *)
and nopervasives = ref false (* -nopervasives *)
and preprocessor = ref(None : string option) (* -pp *)
diff --git a/utils/config.mli b/utils/config.mli
index 74dec59d30..061f3b9f1a 100644
--- a/utils/config.mli
+++ b/utils/config.mli
@@ -25,6 +25,8 @@ val native_c_compiler: string
(* The C compiler to use for the native code compiler *)
val c_libraries: string
(* The C libraries to link with custom runtimes *)
+val ranlib: string
+ (* Command to randomize a library, or "" if not needed *)
val load_path: string list ref
(* Directories in the search path for .cmi and .cmo files *)
diff --git a/utils/config.mlp b/utils/config.mlp
index 7757dd06ea..7c2effd771 100644
--- a/utils/config.mlp
+++ b/utils/config.mlp
@@ -20,10 +20,9 @@ let standard_library =
"%%LIBDIR%%"
let bytecomp_c_compiler = "%%BYTECC%%"
-
let native_c_compiler = "%%NATIVECC%%"
-
let c_libraries = "%%CCLIBS%%"
+let ranlib = "%%RANLIBCMD%%"
let exec_magic_number = "Caml1999X001"
and cmi_magic_number = "Caml1999I002"