From defde40088462873ef714344bdf859e91b6349fd Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 4 Feb 2022 12:27:48 -0500
Subject: Enable Oniguruma by default

---
 Makefile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 328b852..b73f00a 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,15 @@ ASAN := $(filter asan,$(MAKECMDGOALS))
 MSAN := $(filter msan,$(MAKECMDGOALS))
 UBSAN := $(filter ubsan,$(MAKECMDGOALS))
 
+ifndef MSAN
+WITH_ONIGURUMA := y
+endif
+
+ifdef WITH_ONIGURUMA
+LOCAL_LDLIBS += -lonig
+LOCAL_CFLAGS += -DBFS_WITH_ONIGURUMA=1
+endif
+
 ifeq ($(OS),Linux)
 ifndef MSAN # These libraries are not built with msan
 WITH_ACL := y
@@ -101,11 +110,6 @@ else # Linux
 DISTCHECK_FLAGS := TEST_FLAGS="--verbose"
 endif
 
-ifdef WITH_ONIGURUMA
-LOCAL_LDLIBS += -lonig
-LOCAL_CFLAGS += -DBFS_WITH_ONIGURUMA=1
-endif
-
 ifeq ($(OS),NetBSD)
 LOCAL_LDLIBS += -lutil
 endif
-- 
cgit v1.2.3