[build] g++ versions prior to 4.5 don't support the --static-libstdc++ flag so hack around it

2016-02-08 11:58:19 +00:00
parent ebd4981271
commit 244405ed5d
2 changed files with 8 additions and 13 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,11 +110,15 @@ CXXFLAGS+=@CXXOPTIMISE_FLAG@
 CXXFLAGS+=@CXXDEBUG_FLAG@
 CXXFLAGS+=@CXX_STRERROR_FLAG@
 CXXFLAGS+=@LFS_FLAGS@
-CXXFLAGS+=@STATIC_LINK_FLAGS@
-LDFLAGS+=@STATIC_LINK_FLAGS@
 INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
 LIBS:=-laio -lexpat
-LIBS+=@DYNAMIC_LINK_FLAGS@
+
+ifeq ("@STATIC_CXX@", "yes")
+LIBS+=$(shell  g++ -print-file-name=libstdc++.a)
+else
+LIBS+=-lstdc++
+endif
+
 INSTALL:=@INSTALL@
 PREFIX:=@prefix@
 BINDIR:=$(DESTDIR)$(PREFIX)/sbin