From 3cdf67e77da64ba1235265836f29b228deca3642 Mon Sep 17 00:00:00 2001
From: data-man <dataman@tutanota.com>
Date: Mon, 24 Jan 2022 20:38:00 +0500
Subject: Apply suggestions from code review

---
 Makefile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 77de641..8af4a99 100644
--- a/Makefile
+++ b/Makefile
@@ -72,11 +72,6 @@ ifeq ($(OS),Linux)
 LOCAL_LDFLAGS += -Wl,--as-needed
 LOCAL_LDLIBS += -lacl -lcap -lattr -lrt
 
-ifdef USE_ONIGURUMA
-LOCAL_LDLIBS += -lonig
-LOCAL_CFLAGS += -DUSE_ONIGURUMA
-endif
-
 # These libraries are not built with msan, so disable them
 MSAN_CFLAGS += -DBFS_HAS_SYS_ACL=0 -DBFS_HAS_SYS_CAPABILITY=0 -DBFS_HAS_SYS_XATTR=0
 
@@ -87,11 +82,6 @@ endif
 
 ifeq ($(OS),NetBSD)
 LOCAL_LDLIBS += -lutil
-
-ifdef USE_ONIGURUMA
-LOCAL_LDLIBS += -lonig
-LOCAL_CFLAGS += -DUSE_ONIGURUMA
-endif
 endif
 
 ifneq ($(filter asan,$(MAKECMDGOALS)),)
@@ -121,6 +111,11 @@ ifneq ($(filter release,$(MAKECMDGOALS)),)
 CFLAGS := $(DEFAULT_CFLAGS) -O3 -flto -DNDEBUG
 endif
 
+ifeq ($(USE_ONIGURUMA),1)
+LOCAL_LDLIBS += -lonig
+LOCAL_CFLAGS += -DBFS_USE_ONIGURUMA=1
+endif
+
 ALL_CPPFLAGS = $(LOCAL_CPPFLAGS) $(CPPFLAGS)
 ALL_CFLAGS = $(ALL_CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS) $(DEPFLAGS)
 ALL_LDFLAGS = $(ALL_CFLAGS) $(LOCAL_LDFLAGS) $(LDFLAGS)
-- 
cgit v1.2.3