summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2020-09-23 15:41:18 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2020-09-23 15:41:18 +0900
commitf052642278b0c5ca48bdb9bbef1cafeaafc509c4 (patch)
tree9f30313060571b42f5c25febfa0d1554964a49a3 /Makefile
parent036d6d0c2f3d30b6e783bd6c82ab27b704f90888 (diff)
downloadre2-f052642278b0c5ca48bdb9bbef1cafeaafc509c4.tar.gz
re2-f052642278b0c5ca48bdb9bbef1cafeaafc509c4.tar.bz2
re2-f052642278b0c5ca48bdb9bbef1cafeaafc509c4.zip
Imported Upstream version 20191101upstream/20191101
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 3571611..15d7824 100644
--- a/Makefile
+++ b/Makefile
@@ -80,24 +80,25 @@ HFILES=\
util/benchmark.h\
util/flags.h\
util/logging.h\
+ util/malloc_counter.h\
util/mix.h\
util/mutex.h\
util/pcre.h\
- util/pod_array.h\
- util/sparse_array.h\
- util/sparse_set.h\
util/strutil.h\
util/test.h\
util/utf.h\
util/util.h\
re2/bitmap256.h\
re2/filtered_re2.h\
+ re2/pod_array.h\
re2/prefilter.h\
re2/prefilter_tree.h\
re2/prog.h\
re2/re2.h\
re2/regexp.h\
re2/set.h\
+ re2/sparse_array.h\
+ re2/sparse_set.h\
re2/stringpiece.h\
re2/testing/exhaustive_tester.h\
re2/testing/regexp_generator.h\
@@ -213,9 +214,10 @@ obj/so/test/%: obj/so/libre2.$(SOEXT) obj/libre2.a obj/re2/testing/%.o $(TESTOFI
@mkdir -p obj/so/test
$(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/util/test.o -Lobj/so -lre2 obj/libre2.a $(RE2_LDFLAGS) $(LDFLAGS)
+# Filter out dump.o because testing::TempDir() isn't available for it.
obj/test/regexp_benchmark: obj/libre2.a obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o
@mkdir -p obj/test
- $(CXX) -o $@ obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o obj/libre2.a $(RE2_LDFLAGS) $(LDFLAGS)
+ $(CXX) -o $@ obj/re2/testing/regexp_benchmark.o $(filter-out obj/re2/testing/dump.o, $(TESTOFILES)) obj/util/benchmark.o obj/libre2.a $(RE2_LDFLAGS) $(LDFLAGS)
# re2_fuzzer is a target for fuzzers like libFuzzer and AFL. This fake fuzzing
# is simply a way to check that the target builds and then to run it against a