diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2014-12-17 13:23:51 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2014-12-17 13:23:51 +0100 |
| commit | a80705575b12c9813d6a7ecf92bb33aedd10b09e (patch) | |
| tree | 0b260d771fcd5aef702f3389769a6dae65b8e9bf /driver | |
| parent | e86596ae60132b0821cb8b15409074e4cd76243a (diff) | |
| parent | c1daedb244d1f7586c12749642b0d78ae910e60a (diff) | |
| download | compcert-a80705575b12c9813d6a7ecf92bb33aedd10b09e.tar.gz compcert-a80705575b12c9813d6a7ecf92bb33aedd10b09e.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Configuration.ml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/driver/Configuration.ml b/driver/Configuration.ml index aff638e7..e73125f7 100644 --- a/driver/Configuration.ml +++ b/driver/Configuration.ml @@ -58,8 +58,6 @@ let get_config key = let bad_config key v = Printf.eprintf "Invalid value `%s' for configuation option `%s'\n" v key; exit 2 -let stdlib_path = get_config "stdlib_path" - let prepro = get_config "prepro" let asm = get_config "asm" let linker = get_config "linker" @@ -81,6 +79,13 @@ let has_runtime_lib = | "false" -> false | v -> bad_config "has_runtime_lib" v + +let stdlib_path = + if has_runtime_lib then + get_config "stdlib_path" + else + "" + let asm_supports_cfi = match get_config "asm_supports_cfi" with | "true" -> true |