diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-06-17 18:53:39 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-06-17 18:53:39 +0200 |
| commit | b51cc596555dae929e75e4a02520f01d6f53978d (patch) | |
| tree | 7a43ce306cb641b85dab43e88ed757edb873eed2 /driver/Driver.ml | |
| parent | e503983cdc99c6038ada0d0b94f32f02d13210c8 (diff) | |
| parent | 0e9ededa8c1d194453f5113bf57c93d0803f03b1 (diff) | |
| download | compcert-b51cc596555dae929e75e4a02520f01d6f53978d.tar.gz compcert-b51cc596555dae929e75e4a02520f01d6f53978d.zip | |
Merge branch 'master' into json_export
Diffstat (limited to 'driver/Driver.ml')
| -rw-r--r-- | driver/Driver.ml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/driver/Driver.ml b/driver/Driver.ml index 90badb85..352483bf 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -93,8 +93,8 @@ let preprocess ifile ofile = let cmd = List.concat [ Configuration.prepro; ["-D__COMPCERT__"]; - (if Configuration.has_runtime_lib - then ["-I" ^ !stdlib_path] + (if Configuration.has_standard_headers + then ["-I" ^ Filename.concat !stdlib_path "include" ] else []); List.rev !prepro_options; [ifile] @@ -515,6 +515,8 @@ let cmdline_actions = Exact "-E", Set option_E; Exact "-S", Set option_S; Exact "-o", String(fun s -> option_o := Some s); + Prefix "-o", Self (fun s -> let s = String.sub s 2 ((String.length s) - 2) in + option_o := Some s); (* Preprocessing options *) Exact "-I", String(fun s -> prepro_options := s :: "-I" :: !prepro_options); Prefix "-I", Self(fun s -> prepro_options := s :: !prepro_options); |