Lines 13-21
Link Here
|
13 |
# LDPCRE=-L/usr/local/lib -lpcre |
13 |
# LDPCRE=-L/usr/local/lib -lpcre |
14 |
|
14 |
|
15 |
CXX?=g++ |
15 |
CXX?=g++ |
16 |
CXXFLAGS?=-std=c++11 -O3 -g -pthread # can override |
16 |
CXXFLAGS?=-O3 -g # can override |
17 |
RE2_CXXFLAGS?=-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE) # required |
17 |
RE2_CXXFLAGS?=-std=c++11 -pthread -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE) # required |
18 |
LDFLAGS?=-pthread $(LDICU) |
18 |
LDFLAGS?= |
|
|
19 |
RE2_LDFLAGS=-pthread $(LDICU) |
19 |
AR?=ar |
20 |
AR?=ar |
20 |
ARFLAGS?=rsc |
21 |
ARFLAGS?=rsc |
21 |
NM?=nm |
22 |
NM?=nm |
Lines 44-60
Link Here
|
44 |
SOEXT=dylib |
45 |
SOEXT=dylib |
45 |
SOEXTVER=$(SONAME).$(SOEXT) |
46 |
SOEXTVER=$(SONAME).$(SOEXT) |
46 |
SOEXTVER00=$(SONAME).0.0.$(SOEXT) |
47 |
SOEXTVER00=$(SONAME).0.0.$(SOEXT) |
47 |
MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-install_name,@rpath/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(LDFLAGS) |
48 |
MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-install_name,@rpath/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(RE2_LDFLAGS) $(LDFLAGS) |
48 |
else ifeq ($(shell uname),SunOS) |
49 |
else ifeq ($(shell uname),SunOS) |
49 |
SOEXT=so |
50 |
SOEXT=so |
50 |
SOEXTVER=$(SOEXT).$(SONAME) |
51 |
SOEXTVER=$(SOEXT).$(SONAME) |
51 |
SOEXTVER00=$(SOEXT).$(SONAME).0.0 |
52 |
SOEXTVER00=$(SOEXT).$(SONAME).0.0 |
52 |
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),-M,libre2.symbols $(LDFLAGS) |
53 |
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),-M,libre2.symbols $(RE2_LDFLAGS) $(LDFLAGS) |
53 |
else |
54 |
else |
54 |
SOEXT=so |
55 |
SOEXT=so |
55 |
SOEXTVER=$(SOEXT).$(SONAME) |
56 |
SOEXTVER=$(SOEXT).$(SONAME) |
56 |
SOEXTVER00=$(SOEXT).$(SONAME).0.0 |
57 |
SOEXTVER00=$(SOEXT).$(SONAME).0.0 |
57 |
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),--version-script,libre2.symbols $(LDFLAGS) |
58 |
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),--version-script,libre2.symbols $(RE2_LDFLAGS) $(LDFLAGS) |
58 |
endif |
59 |
endif |
59 |
|
60 |
|
60 |
all: obj/libre2.a obj/so/libre2.$(SOEXT) |
61 |
all: obj/libre2.a obj/so/libre2.$(SOEXT) |
Lines 198-217
Link Here
|
198 |
|
199 |
|
199 |
obj/dbg/test/%: obj/dbg/libre2.a obj/dbg/re2/testing/%.o $(DTESTOFILES) obj/dbg/util/test.o |
200 |
obj/dbg/test/%: obj/dbg/libre2.a obj/dbg/re2/testing/%.o $(DTESTOFILES) obj/dbg/util/test.o |
200 |
@mkdir -p obj/dbg/test |
201 |
@mkdir -p obj/dbg/test |
201 |
$(CXX) -o $@ obj/dbg/re2/testing/$*.o $(DTESTOFILES) obj/dbg/util/test.o obj/dbg/libre2.a $(LDFLAGS) $(LDPCRE) |
202 |
$(CXX) -o $@ obj/dbg/re2/testing/$*.o $(DTESTOFILES) obj/dbg/util/test.o obj/dbg/libre2.a $(RE2_LDFLAGS) $(LDFLAGS) $(LDPCRE) |
202 |
|
203 |
|
203 |
obj/test/%: obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/util/test.o |
204 |
obj/test/%: obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/util/test.o |
204 |
@mkdir -p obj/test |
205 |
@mkdir -p obj/test |
205 |
$(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/util/test.o obj/libre2.a $(LDFLAGS) $(LDPCRE) |
206 |
$(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/util/test.o obj/libre2.a $(RE2_LDFLAGS) $(LDFLAGS) $(LDPCRE) |
206 |
|
207 |
|
207 |
# Test the shared lib, falling back to the static lib for private symbols |
208 |
# Test the shared lib, falling back to the static lib for private symbols |
208 |
obj/so/test/%: obj/so/libre2.$(SOEXT) obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/util/test.o |
209 |
obj/so/test/%: obj/so/libre2.$(SOEXT) obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/util/test.o |
209 |
@mkdir -p obj/so/test |
210 |
@mkdir -p obj/so/test |
210 |
$(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/util/test.o -Lobj/so -lre2 obj/libre2.a $(LDFLAGS) $(LDPCRE) |
211 |
$(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/util/test.o -Lobj/so -lre2 obj/libre2.a $(RE2_LDFLAGS) $(LDFLAGS) $(LDPCRE) |
211 |
|
212 |
|
212 |
obj/test/regexp_benchmark: obj/libre2.a obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o |
213 |
obj/test/regexp_benchmark: obj/libre2.a obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o |
213 |
@mkdir -p obj/test |
214 |
@mkdir -p obj/test |
214 |
$(CXX) -o $@ obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o obj/libre2.a $(LDFLAGS) $(LDPCRE) |
215 |
$(CXX) -o $@ obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/util/benchmark.o obj/libre2.a $(RE2_LDFLAGS) $(LDFLAGS) $(LDPCRE) |
215 |
|
216 |
|
216 |
ifdef REBUILD_TABLES |
217 |
ifdef REBUILD_TABLES |
217 |
re2/perl_groups.cc: re2/make_perl_groups.pl |
218 |
re2/perl_groups.cc: re2/make_perl_groups.pl |