From 2129fe8f2e19c4dd91955e5300e76d924e0a3e6d Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Tue, 19 Jul 2016 09:44:26 +0200
Subject: Merged responfile function into command.

Command now decides whether to use a responsefile or call the
external command directly.
Bug 18004
---
 driver/Linker.ml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'driver/Linker.ml')

diff --git a/driver/Linker.ml b/driver/Linker.ml
index 14c9bcb3..305c5603 100644
--- a/driver/Linker.ml
+++ b/driver/Linker.ml
@@ -19,19 +19,14 @@ open Driveraux
 (* Linking *)
 
 let linker exe_name files =
-  let cmd,opts = match Configuration.linker with
-  | name::opts -> name,opts
-  | [] -> assert false (* Should be catched in Configuration *) in
-  let opts = List.concat [
-    opts;
+  let cmd = List.concat [
+    Configuration.linker;
     ["-o"; exe_name];
     files;
     (if Configuration.has_runtime_lib
     then ["-L" ^ !stdlib_path; "-lcompcert"]
     else [])
   ] 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
     command_error "linker" exc;
-- 
cgit