diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | regexp.h | 5 |
2 files changed, 8 insertions, 12 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) @@ -1,6 +1,7 @@ /**************************************************************************** * bfs * - * Copyright (C) 2016-2022 Tavian Barnes <tavianator@tavianator.com> * + * Copyright (C) 2022 Tavian Barnes <tavianator@tavianator.com> and * + * BFS contributors * * * * Permission to use, copy, modify, and/or distribute this software for any * * purpose with or without fee is hereby granted. * @@ -17,7 +18,7 @@ #ifndef BFS_REGEXP_H #define BFS_REGEXP_H -#ifdef USE_ONIGURUMA +#if BFS_USE_ONIGURUMA == 1 #include <onigposix.h> #else #include <regex.h> |