diff options
| author | data-man <dataman@tutanota.com> | 2022-01-24 20:38:00 +0500 |
|---|---|---|
| committer | data-man <dataman@tutanota.com> | 2022-01-24 20:38:00 +0500 |
| commit | 3cdf67e77da64ba1235265836f29b228deca3642 (patch) | |
| tree | f799fcd92f2b52cd3a098d9f39200b8a89b15d80 /Makefile | |
| parent | 09124f64f6eb332e49b4d13c4975fc36260f7f2b (diff) | |
| download | bfs-3cdf67e77da64ba1235265836f29b228deca3642.tar.xz | |
Apply suggestions from code review
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -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) |