diff options
-rwxr-xr-x | configure | 26 |
1 files changed, 7 insertions, 19 deletions
@@ -21,8 +21,6 @@ has_runtime_lib=true has_standard_headers=true clightgen=false responsefile="gnu" -merlin=false -coqproject=false usage='Usage: ./configure [options] target @@ -71,8 +69,6 @@ Options: -no-runtime-lib Do not compile nor install the runtime support library -no-standard-headers Do not install nor use the standard .h headers -clightgen Also compile the clightgen tool - -merlin Generate .merlin file - -coqproject Generate a _CoqProject file for Proof General ' @@ -97,10 +93,6 @@ while : ; do has_standard_headers=false;; -clightgen) clightgen=true;; - -merlin) - merlin=true;; - -coqproject) - coqproject=true;; *) if test -n "$target"; then echo "$usage" 1>&2; exit 2; fi target="$1";; @@ -493,8 +485,7 @@ if $missingtools; then exit 2 fi -if $merlin; then - cat > .merlin <<EOF +cat > .merlin <<EOF S lib S common S $arch @@ -518,10 +509,8 @@ B cparser B extraction EOF -fi -if $coqproject; then - echo "-R lib compcert.lib \ +echo "-R lib compcert.lib \ -R common compcert.common \ -R ${arch} compcert.${arch} \ -R backend compcert.backend \ @@ -530,12 +519,11 @@ if $coqproject; then -R flocq compcert.flocq \ -R exportclight compcert.exportclight \ -R cparser compcert.cparser" > _CoqProject - case $arch in - x86) - echo "-R x86_${bitsize} compcert.x86_${bitsize}" >> _CoqProject - ;; - esac -fi +case $arch in + x86) + echo "-R x86_${bitsize} compcert.x86_${bitsize}" >> _CoqProject + ;; +esac # # Generate Makefile.config |