Skip to content

Commit 9ea3eff

Browse files
committed
Move linker flags out of $(MAKE_SHARED_LIBRARY).
`$(RE2_LDFLAGS) $(LDFLAGS)` now appear after `$(SOFILES)`, which is needed by Debian and possibly others. Incidentally, this also makes the shared library rule more consistent with nearby rules. Fixes #432. Change-Id: I5509b03e007e5e5cd32f5aa211862fc6b8ece0da Reviewed-on: https://code-review.googlesource.com/c/re2/+/61430 Reviewed-by: Alex Chernyakhovsky <achernya@google.com> Reviewed-by: Paul Wankadia <junyer@google.com>
1 parent 7c5e396 commit 9ea3eff

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ ifeq ($(shell uname),Darwin)
8181
SOEXT=dylib
8282
SOEXTVER=$(SONAME).$(SOEXT)
8383
SOEXTVER00=$(SONAME).0.0.$(SOEXT)
84-
MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-compatibility_version,$(SONAME),-current_version,$(SONAME).0.0,-install_name,$(libdir)/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(RE2_LDFLAGS) $(LDFLAGS)
84+
MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-compatibility_version,$(SONAME),-current_version,$(SONAME).0.0,-install_name,$(libdir)/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin
8585
else ifeq ($(shell uname),SunOS)
8686
SOEXT=so
8787
SOEXTVER=$(SOEXT).$(SONAME)
8888
SOEXTVER00=$(SOEXT).$(SONAME).0.0
89-
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER) $(RE2_LDFLAGS) $(LDFLAGS)
89+
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER)
9090
else
9191
SOEXT=so
9292
SOEXTVER=$(SOEXT).$(SONAME)
9393
SOEXTVER00=$(SOEXT).$(SONAME).0.0
94-
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),--version-script,libre2.symbols $(RE2_LDFLAGS) $(LDFLAGS)
94+
MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),--version-script,libre2.symbols
9595
endif
9696

9797
.PHONY: all
@@ -225,7 +225,7 @@ obj/dbg/libre2.a: $(DOFILES)
225225
.PRECIOUS: obj/so/libre2.$(SOEXT)
226226
obj/so/libre2.$(SOEXT): $(SOFILES) libre2.symbols libre2.symbols.darwin
227227
@mkdir -p obj/so
228-
$(MAKE_SHARED_LIBRARY) -o obj/so/libre2.$(SOEXTVER) $(SOFILES)
228+
$(MAKE_SHARED_LIBRARY) -o obj/so/libre2.$(SOEXTVER) $(SOFILES) $(RE2_LDFLAGS) $(LDFLAGS)
229229
ln -sf libre2.$(SOEXTVER) $@
230230

231231
.PRECIOUS: obj/dbg/test/%

0 commit comments

Comments
 (0)