Merge pull request #1306 from jeremybennett/jpb-config-fix
Fix bug in configure.ac and regenerate configure
diff --git a/configure b/configure
index 25697a7..c7f09bc 100755
--- a/configure
+++ b/configure
@@ -587,12 +587,9 @@
qemu_targets
enable_libsanitizer
with_linux_headers_src
+with_dejagnu_src
with_llvm_src
with_pk_src
-with_dejagnu_src
-with_pk_src
-with_dejagnu_src
-with_pk_src
with_spike_src
with_qemu_src
with_gdb_src
@@ -1334,7 +1331,6 @@
[--disable-linux]
--enable-debug-info build glibc/musl/newlibc/libgcc with debug
information
- --disable-debug-info build glibc and musl without debug infromation
--enable-multilib build both RV32 and RV64 runtime libraries (only
RV64 for musl libc) [--disable-multilib]
--enable-gcc-checking Enable gcc internal checking, it will make gcc very
@@ -3303,11 +3299,18 @@
enableval=$enable_debug_info; enable_debug_info=yes
else
enable_debug_info=no
- enableval=$enable_debug_info; disable_debug_info=yes
+
fi
if test "x$enable_debug_info" != xyes; then :
+ disable_debug_info=yes
+else
+ disable_debug_info=no
+
+fi
+
+if test "x$enable_debug_info" != xyes; then :
debug_info=""
else
@@ -3805,25 +3808,6 @@
fi
}
-{
-
-# Check whether --with-dejagnu-src was given.
-if test "${with_dejagnu_src+set}" = set; then :
- withval=$with_dejagnu_src;
-else
- with_dejagnu_src=default
-
-fi
-
- if test "x$with_dejagnu_src" != xdefault; then :
- with_dejagnu_src=$with_dejagnu_src
-
-else
- with_dejagnu_src="\$(srcdir)/dejagnu"
-
-fi
-
- }
# Check whether --with-linux-headers-src was given.
diff --git a/configure.ac b/configure.ac
index 9e70bb2..33e00f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+## Process this file with autoconf 2.69. Other versions may not work.
AC_INIT(riscv-toolchain, 1.0)
AC_PROG_CC
@@ -58,8 +59,6 @@
)
AS_IF([test "x$enable_debug_info" != xyes],
- [AS_HELP_STRING([--disable-debug-info],
- [build glibc and musl without debug infromation])],
[disable_debug_info=yes],
[disable_debug_info=no]
)
