[build] another go at static libc++

This commit is contained in:
Joe Thornber 2016-02-09 10:57:39 +00:00
parent 244405ed5d
commit dc08c78b46

View File

@ -114,9 +114,9 @@ INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
LIBS:=-laio -lexpat LIBS:=-laio -lexpat
ifeq ("@STATIC_CXX@", "yes") ifeq ("@STATIC_CXX@", "yes")
LIBS+=$(shell g++ -print-file-name=libstdc++.a) CXXLIB+=-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -Wl,--as-needed
else else
LIBS+=-lstdc++ CXXLIB+=-lstdc++
endif endif
INSTALL:=@INSTALL@ INSTALL:=@INSTALL@
@ -157,7 +157,7 @@ lib/libpdata.a: $(OBJECTS)
bin/pdata_tools: $(OBJECTS) bin/pdata_tools: $(OBJECTS)
@echo " [LD] $@" @echo " [LD] $@"
$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(CXXLIB)
#---------------------------------------------------------------- #----------------------------------------------------------------