diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-19 09:44:26 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-19 09:44:26 +0200 |
commit | 2129fe8f2e19c4dd91955e5300e76d924e0a3e6d (patch) | |
tree | 142db2c4fd4931dc7b2d6cfb1bf77e8f4e5ec584 /driver/Assembler.ml | |
parent | efa462bd1655c6b2c8f064e214762650092257e8 (diff) | |
download | compcert-2129fe8f2e19c4dd91955e5300e76d924e0a3e6d.tar.gz compcert-2129fe8f2e19c4dd91955e5300e76d924e0a3e6d.zip |
Merged responfile function into command.
Command now decides whether to use a responsefile or call the
external command directly.
Bug 18004
Diffstat (limited to 'driver/Assembler.ml')
-rw-r--r-- | driver/Assembler.ml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/driver/Assembler.ml b/driver/Assembler.ml index d6cb65ea..52fb17d8 100644 --- a/driver/Assembler.ml +++ b/driver/Assembler.ml @@ -18,17 +18,12 @@ open Driveraux (* From asm to object file *) let assemble ifile ofile = - let cmd,opts = match Configuration.asm with - | name::opts -> name,opts - | [] -> assert false (* Should be catched in Configuration *) in - let opts = List.concat [ - opts; + let cmd = List.concat [ + Configuration.asm; ["-o"; ofile]; List.rev !assembler_options; [ifile] ] in - let opts = responsefile opts (fun a -> if gnu_system then ["@"^a] else ["@"^a]) in - let cmd = cmd::opts in let exc = command cmd in if exc <> 0 then begin safe_remove ofile; |