From 83023733e8ac5fa28893b260664f6d6527b481ab Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Thu, 15 Jan 2015 15:42:14 +0100
Subject: Added variable to the Makefile to specify additional linker commands
 and changed the configure script to deactivated the checklink build if
 needed.

---
 configure | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 10b2c2f1..820ab650 100755
--- a/configure
+++ b/configure
@@ -18,6 +18,7 @@ libdir='$(PREFIX)/lib/compcert'
 toolprefix=''
 target=''
 has_runtime_lib=true
+build_checklink=true
 
 usage='Usage: ./configure [options] target
 
@@ -64,6 +65,8 @@ while : ; do
         toolprefix="$2"; shift;;
     -no-runtime-lib)
         has_runtime_lib=false; shift;;
+    -no-checklink)
+        build_checklink=false; shift;;
     *)
         if test -n "$target"; then echo "$usage" 1>&2; exit 2; fi
         target="$1";;
@@ -89,7 +92,7 @@ case "$target" in
     casmruntime="${toolprefix}gcc -c -Wa,-mregnames"
     clinker="${toolprefix}gcc"
     libmath="-lm"
-    cchecklink=true;;
+    cchecklink=build_checklink;;
   powerpc-eabi-diab|ppc-eabi-diab)
     arch="powerpc"
     model="standard"
@@ -101,7 +104,7 @@ case "$target" in
     asm_supports_cfi=false
     clinker="${toolprefix}dcc"
     libmath="-lm"
-    cchecklink=true;;
+    cchecklink=build_checklink;;
   arm*-*)
     arch="arm"
     case "$target" in
-- 
cgit 


From 5fc6c02e6c815f9ba3348ddc49b5b1d7563ec35c Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Thu, 15 Jan 2015 17:42:53 +0100
Subject: Added missing $ for build_checklink

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 820ab650..447bc0a2 100755
--- a/configure
+++ b/configure
@@ -92,7 +92,7 @@ case "$target" in
     casmruntime="${toolprefix}gcc -c -Wa,-mregnames"
     clinker="${toolprefix}gcc"
     libmath="-lm"
-    cchecklink=build_checklink;;
+    cchecklink=${build_checklink};;
   powerpc-eabi-diab|ppc-eabi-diab)
     arch="powerpc"
     model="standard"
@@ -104,7 +104,7 @@ case "$target" in
     asm_supports_cfi=false
     clinker="${toolprefix}dcc"
     libmath="-lm"
-    cchecklink=build_checklink;;
+    cchecklink=${build_checklink};;
   arm*-*)
     arch="arm"
     case "$target" in
-- 
cgit