From c130f4936bad11fd6dab3a5d142b870d2a5f650c Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Mon, 29 Dec 2014 11:15:29 +0100
Subject: Use Unix.create_process instead of Sys.command (continued).

---
 Makefile.extr | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile.extr')

diff --git a/Makefile.extr b/Makefile.extr
index 35ae5f7b..5c9cc8dd 100644
--- a/Makefile.extr
+++ b/Makefile.extr
@@ -75,9 +75,10 @@ OCAMLLEX=ocamllex -q
 MODORDER=tools/modorder .depend.extr
 
 PARSERS=backend/CMparser.mly cparser/pre_parser.mly
-LEXERS=backend/CMlexer.mll cparser/Lexer.mll lib/Tokenize.mll
+LEXERS=backend/CMlexer.mll cparser/Lexer.mll \
+       lib/Tokenize.mll lib/Readconfig.mll
 
-LIBS=str.cmxa
+LIBS=str.cmxa unix.cmxa
 
 EXECUTABLES=ccomp ccomp.byte cchecklink cchecklink.byte clightgen clightgen.byte
 GENERATED=$(PARSERS:.mly=.mli) $(PARSERS:.mly=.ml) $(LEXERS:.mll=.ml)
-- 
cgit 


From b0c09b32f3e559ca22afc4dc40fdd60964cb3292 Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Tue, 20 Jan 2015 16:50:07 +0100
Subject: Removed the linker flag again.

---
 Makefile.extr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile.extr')

diff --git a/Makefile.extr b/Makefile.extr
index 2afd6e31..5f02bf38 100644
--- a/Makefile.extr
+++ b/Makefile.extr
@@ -90,11 +90,11 @@ CCOMP_OBJS:=$(shell $(MODORDER) driver/Driver.cmx)
 
 ccomp: $(CCOMP_OBJS)
 	@echo "Linking $@"
-	@$(OCAMLOPT) -o $@ $(LIBS) $+ $(LINKERSPEC)
+	@$(OCAMLOPT) -o $@ $(LIBS) $+
 
 ccomp.byte: $(CCOMP_OBJS:.cmx=.cmo)
 	@echo "Linking $@"
-	@$(OCAMLC) -o $@ $(LIBS:.cmxa=.cma) $+ $(LINKERSPEC)
+	@$(OCAMLC) -o $@ $(LIBS:.cmxa=.cma) $+
 
 ifeq ($(CCHECKLINK),true)
 
-- 
cgit 


From a452aa6d282ceb3408cc5557c7b07798a3887b06 Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Fri, 20 Feb 2015 10:52:58 +0100
Subject: Removed the Unix from the libraries for cchecklink.

---
 Makefile.extr | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile.extr')

diff --git a/Makefile.extr b/Makefile.extr
index 543f4637..83ef3e2b 100644
--- a/Makefile.extr
+++ b/Makefile.extr
@@ -79,6 +79,7 @@ LEXERS=backend/CMlexer.mll cparser/Lexer.mll \
        lib/Tokenize.mll lib/Readconfig.mll
 
 LIBS=str.cmxa unix.cmxa
+CHECKLINK_LIBS=str.cmxa
 
 EXECUTABLES=ccomp ccomp.byte cchecklink cchecklink.byte clightgen clightgen.byte
 GENERATED=$(PARSERS:.mly=.mli) $(PARSERS:.mly=.ml) $(LEXERS:.mll=.ml)
@@ -103,11 +104,11 @@ CCHECKLINK_OBJS:=$(shell $(MODORDER) checklink/Validator.cmx)
 
 cchecklink: $(CCHECKLINK_OBJS)
 	@echo "Linking $@"
-	@$(OCAMLOPT_P4) -linkpkg -o $@ $(LIBS) $+
+	@$(OCAMLOPT_P4) -linkpkg -o $@ $(CHECKLINK_LIBS) $+
 
 cchecklink.byte: $(CCHECKLINK_OBJS:.cmx=.cmo)
 	@echo "Linking $@"
-	@$(OCAMLC_P4) -linkpkg -o $@ $(LIBS:.cmxa=.cma) $+
+	@$(OCAMLC_P4) -linkpkg -o $@ $(CHECKLINK_LIBS:.cmxa=.cma) $+
 
 endif
 
-- 
cgit