backtrace: add support for windows and for llvm (via libbacktrace).

1 files changed, 11 insertions, 2 deletions

diff --git a/configure b/configure
index e8825439c..af0ea2978 100755
--- a/configure
+++ b/configure
@@ -14,12 +14,13 @@ libdirreverse=../..
 gcc_src_dir=
 gcc_version=unknown
 llvm_prefix=
+backtrace_lib=
 build=
 
 show_help=no
 progname=$0
 
-subst_vars="CC GNATMAKE CFLAGS LDFLAGS build srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_prefix"
+subst_vars="CC GNATMAKE CFLAGS LDFLAGS build srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_prefix backtrace_lib"
 
 # Find srcdir
 srcdir=`dirname $progname`
@@ -68,6 +69,7 @@ for opt do
       --srcdir=*) srcdir="$optarg";;
       --with-gcc=*) gcc_src_dir="$optarg"; backend=gcc;;
       --with-llvm=*) llvm_prefix="$optarg"; backend=llvm;;
+      --with-backtrace-lib=*) backtrace_lib="$optarg";;
       -h|-help|--help) show_help=yes;;
       *) echo "$0: unknown option $opt; try $0 --help"
 	  exit 1
@@ -85,6 +87,9 @@ Options [defaults in brackets]:
   --srcdir=SRCDIR   source code path [$srcdir]
   --with-gcc=DIR    use gcc backend from DIR (needs gcc $gcc_version)
   --with-llvm=DIR   use llvm installed in DIR (needs llvm $llvm_version)
+  --with-backtrace-lib=LIB.a
+                    link with libbacktrace LIB.a to display a backtrace on
+                    errors (only for llvm).
 EOF
 exit 0
 fi
@@ -115,6 +120,10 @@ if test $backend = mcode; then
 	echo "WARNING: GHDL for mcode is supported only on x86 (32 bits)"
 	echo "continuing, but build failure expected (See the README)"
     fi
+    if test "x$backtrace_lib" != x ; then
+	echo "WARNING: --with-backtrace-lib= ignored with mcode"
+	backtrace_lib=
+    fi
 fi
 
 # For gcc backend, check version
@@ -144,7 +153,7 @@ if test $backend = llvm; then
 	echo "Need llvm version $llvm_version"
 	exit 1
     fi
-    # For llvm, the c++ compiler isused  for linking so that the standard c++
+    # For llvm, the c++ compiler is used for linking so that the standard c++
     # library is included.  However, the linker needs the no_compact_unwind
     # flag because code generated by gcc is not compatible with compact unwind.
     case "$build" in