diff options
| -rwxr-xr-x | Makefile.in | 8 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 80f5c96..6981001 100755 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ glibc_url := $(GNU_MIRROR)/glibc/glibc-$(glibc_version).tar.gz newlib_url := ftp://sourceware.org/pub/newlib/newlib-$(newlib_version).tar.gz XLEN ?= @XLEN@ -ARCH ?= @ARCH@ +WITH_ARCH ?= @WITH_ARCH@ SYSROOT := $(INSTALL_DIR)/sysroot SHELL := /bin/sh @@ -161,7 +161,7 @@ stamps/build-gcc-linux-stage1: src/gcc stamps/build-binutils-linux \ --disable-nls \ $(MULTILIB_FLAGS) \ --disable-bootstrap \ - --with-arch=$(ARCH) + $(WITH_ARCH) $(MAKE) -C $(notdir $@) inhibit-libc=true all-gcc $(MAKE) -C $(notdir $@) inhibit-libc=true install-gcc $(MAKE) -C $(notdir $@) inhibit-libc=true all-target-libgcc @@ -185,7 +185,7 @@ stamps/build-gcc-linux-stage2: src/gcc stamps/build-glibc-linux$(XLEN) \ --disable-nls \ $(MULTILIB_FLAGS) \ --disable-bootstrap \ - --with-arch=$(ARCH) + $(WITH_ARCH) $(MAKE) -C $(notdir $@) $(MAKE) -C $(notdir $@) install mkdir -p $(dir $@) && touch $@ @@ -226,7 +226,7 @@ stamps/build-gcc-newlib: src/newlib-gcc stamps/build-binutils-newlib --disable-libquadmath \ --disable-libgomp \ --disable-nls \ - --with-arch=$(ARCH) + $(WITH_ARCH) $(MAKE) -C $(notdir $@) inhibit-libc=true $(MAKE) -C $(notdir $@) install mkdir -p $(dir $@) && touch $@ @@ -589,7 +589,7 @@ glibc_configure_flags float_asflags float_cflags atomic_cflags -ARCH +WITH_ARCH XLEN default_target FETCHER @@ -3153,11 +3153,7 @@ fi # Check whether --with-arch was given. if test "${with_arch+set}" = set; then : - withval=$with_arch; ARCH=$withval - -else - ARCH=IMAFD - + withval=$with_arch; WITH_ARCH=--with-arch=$withval fi diff --git a/configure.ac b/configure.ac index 1b26bcb..2625aa0 100644 --- a/configure.ac +++ b/configure.ac @@ -59,8 +59,8 @@ AC_ARG_WITH(xlen, AC_ARG_WITH(arch, [AS_HELP_STRING([--with-arch=IMAFD], [Sets the base RISC-V ISA, defaults to IMAFD])], - AC_SUBST(ARCH, $withval), - AC_SUBST(ARCH, IMAFD) + AC_SUBST(WITH_ARCH, --with-arch=$withval), + AC_SUBST(WITH_ARCH,) ) AC_ARG_ENABLE(atomic, |