From a939758dd0360d2a513248f4033dc611ab1ad6c4 Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Thu, 21 Apr 2022 08:38:19 -0700
Subject: Add an "--enable-libsanitizer" configure-time argument

This lets users select whether or not to build libsanitizer, which
currently does not support rv32 and thus can't be enabled by default.

Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---
 Makefile.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 41fe4c5..7f36894 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ WITH_ABI ?= @WITH_ABI@
 WITH_TUNE ?= @WITH_TUNE@
 WITH_ISA_SPEC ?= @WITH_ISA_SPEC@
 SYSROOT := $(INSTALL_DIR)/sysroot
+ENABLE_LIBSANITIZER ?= @enable_libsanitizer@
 
 SHELL := /bin/sh
 AWK := @GAWK@
@@ -410,9 +411,6 @@ stamps/build-gcc-linux-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) $(addprefix stamps/b
                                stamps/build-glibc-linux-headers
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)
-	# libsanitizer not supported rv32,
-	# but it will break the rv64 multi-lib build, so we disable that
-	# temporally untill rv32 supported.
 	cd $(notdir $@) && $</configure \
 		--target=$(LINUX_TUPLE) \
 		$(CONFIGURE_HOST) \
@@ -426,7 +424,7 @@ stamps/build-gcc-linux-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) $(addprefix stamps/b
 		--disable-libmudflap \
 		--disable-libssp \
 		--disable-libquadmath \
-		--disable-libsanitizer \
+		$(ENABLE_LIBSANITIZER) \
 		--disable-nls \
 		--disable-bootstrap \
 		--src=$(gccsrcdir) \
-- 
cgit v1.1