| From 1ed8cec1fcf666904bb3ebd29fc85e235b72d122 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 4 Sep 2017 22:40:49 -0700 |
| Subject: [PATCH 2/2] makefile: build SHARED_MEMENVLIB |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| Upstream-Status: Pending |
| |
| Makefile | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index f7cc7d7..cb42278 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -126,12 +126,12 @@ SHARED_VERSION_MINOR = 20 |
| SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) |
| SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) |
| SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) |
| -SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) |
| +SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB) |
| $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3) |
| ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1) |
| $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3) |
| ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2) |
| -SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a |
| +SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) |
| endif |
| |
| $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) |
| @@ -294,7 +294,7 @@ endif |
| |
| $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS) |
| rm -f $@ |
| - $(AR) -rs $@ $(SHARED_MEMENVOBJECTS) |
| + $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS) |
| |
| $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) |
| $(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS) |
| -- |
| 2.14.1 |
| |