aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKito Cheng <kito.cheng@sifive.com>2022-02-24 15:56:42 +0800
committerGitHub <noreply@github.com>2022-02-24 15:56:42 +0800
commit63f696c8f23f3eebf5f1af97fd8c66f6483a6393 (patch)
treef4f010fc2cb3a7ee731ec7c94dfee6d58bd4cdae
parent217e7f3debe424d61374d31e33a091a630535937 (diff)
parentf485974e497cbd731316f6a80e720bbd9a664c3d (diff)
downloadriscv-gnu-toolchain-63f696c8f23f3eebf5f1af97fd8c66f6483a6393.zip
riscv-gnu-toolchain-63f696c8f23f3eebf5f1af97fd8c66f6483a6393.tar.gz
riscv-gnu-toolchain-63f696c8f23f3eebf5f1af97fd8c66f6483a6393.tar.bz2
Merge pull request #1029 from florianhofhammer/bugfix/build-qemu2022.02.25
Fix incorrect qemu path in configure script
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac16
2 files changed, 9 insertions, 9 deletions
diff --git a/configure b/configure
index 0532751..adc32b2 100755
--- a/configure
+++ b/configure
@@ -3634,7 +3634,7 @@ fi
with_qemu_src=$with_qemu_src
else
- with_qemu_src="\$(srcdir)/riscv-qemu"
+ with_qemu_src="\$(srcdir)/qemu"
fi
diff --git a/configure.ac b/configure.ac
index ba7dc0e..c977f5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,17 +211,17 @@ AC_DEFUN([AX_ARG_WITH_SRC],
)
AS_IF([test "x$opt_name" != xdefault],
[AC_SUBST(opt_name,$opt_name)],
- [AC_SUBST(opt_name,"\$(srcdir)/riscv-$1")])
+ [AC_SUBST(opt_name,"\$(srcdir)/$2")])
m4_popdef([opt_name])
}])
-AX_ARG_WITH_SRC(gcc)
-AX_ARG_WITH_SRC(binutils)
-AX_ARG_WITH_SRC(newlib)
-AX_ARG_WITH_SRC(glibc)
-AX_ARG_WITH_SRC(musl)
-AX_ARG_WITH_SRC(gdb)
-AX_ARG_WITH_SRC(qemu)
+AX_ARG_WITH_SRC(gcc, riscv-gcc)
+AX_ARG_WITH_SRC(binutils, riscv-binutils)
+AX_ARG_WITH_SRC(newlib, riscv-newlib)
+AX_ARG_WITH_SRC(glibc, riscv-glibc)
+AX_ARG_WITH_SRC(musl, riscv-musl)
+AX_ARG_WITH_SRC(gdb, riscv-gdb)
+AX_ARG_WITH_SRC(qemu, qemu)
AC_ARG_WITH(linux-headers-src,
[AC_HELP_STRING([--with-linux-headers-src],