ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: use CXX to build libraries with C++ code

Browse Source 
If a library contains C++ code, use a C++ compiler when creating a
shared object.  This ensures that the standard C++ libraries are
listed as dependencies.

Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Icc5321a628682e6dbdab0c053784e0750ebd29c2
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9448
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Konrad Sztyber 2021-09-08 16:55:37 +02:00 committed by Keith Lucas
parent 9455b0414a
commit 871c7cca5d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mk/spdk.common.mk
View File

@ -343,12 +343,12 @@ LINK_CXX=\
# Provide function to ease build of a shared lib # Provide function to ease build of a shared lib
define spdk_build_realname_shared_lib define spdk_build_realname_shared_lib
$(CC) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \ $(1) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \
-Wl,-rpath=$(DESTDIR)/$(libdir) \ -Wl,-rpath=$(DESTDIR)/$(libdir) \
-Wl,--soname,$(notdir $@) \ -Wl,--soname,$(notdir $@) \
-Wl,--whole-archive $(1) -Wl,--no-whole-archive \ -Wl,--whole-archive $(2) -Wl,--no-whole-archive \
-Wl,--version-script=$(2) \ -Wl,--version-script=$(3) \
$(3) -Wl,--no-as-needed $(4) -Wl,--as-needed $(4) -Wl,--no-as-needed $(5) -Wl,--as-needed
endef endef
BUILD_LINKERNAME_LIB=\ BUILD_LINKERNAME_LIB=\

8
mk/spdk.lib.mk
View File

@ -85,6 +85,12 @@ ifeq ($(SPDK_NO_LIB_DEPS),)
SPDK_DEP_LIBS = $(call spdk_lib_list_to_shared_libs,$(DEPDIRS-$(LIBNAME))) SPDK_DEP_LIBS = $(call spdk_lib_list_to_shared_libs,$(DEPDIRS-$(LIBNAME)))
endif endif
ifeq ($(CXX_SRCS),)
COMPILER=$(CC)
else
COMPILER=$(CXX)
endif
MODULES-bdev = spdk_bdev_modules MODULES-bdev = spdk_bdev_modules
MODULES-sock = spdk_sock_modules MODULES-sock = spdk_sock_modules
MODULES-accel = spdk_accel_modules MODULES-accel = spdk_accel_modules
@ -106,7 +112,7 @@ $(SHARED_LINKED_LIB): $(SHARED_REALNAME_LIB)
$(SHARED_REALNAME_LIB): $(LIB) $(SHARED_REALNAME_LIB): $(LIB)
$(Q)echo " SO $(notdir $@)"; \ $(Q)echo " SO $(notdir $@)"; \
$(call spdk_build_realname_shared_lib,$^,$(SPDK_MAP_FILE),$(LOCAL_SYS_LIBS),$(SPDK_DEP_LIBS)) $(call spdk_build_realname_shared_lib,$(COMPILER),$^,$(SPDK_MAP_FILE),$(LOCAL_SYS_LIBS),$(SPDK_DEP_LIBS))
define pkgconfig_create define pkgconfig_create
$(Q)$(SPDK_ROOT_DIR)/scripts/pc.sh $(1) $(LIBNAME) $(SO_SUFFIX) \ $(Q)$(SPDK_ROOT_DIR)/scripts/pc.sh $(1) $(LIBNAME) $(SO_SUFFIX) \