From 34387cccec968dbf1560bfd2a2a1da660ae05621 Mon Sep 17 00:00:00 2001 From: Pawel Wodkowski Date: Fri, 5 Oct 2018 16:01:40 +0200 Subject: [PATCH] mk: introduce ldflags print target This is inspired by pkg-config dicussion for SPDK packaging. For now it used during nvme-cli building to remove greps on current configuration just to discover proper LDFLAGS. Change-Id: I18b3e7690dc27b8c418cb897e57e224850fa7435 Signed-off-by: Pawel Wodkowski Reviewed-on: https://review.gerrithub.io/428335 Reviewed-by: Ben Walker Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System --- Makefile | 12 ++++++++++++ test/nvme/spdk_nvme_cli.sh | 6 +----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b747875ab..2afc85b69 100644 --- a/Makefile +++ b/Makefile @@ -97,4 +97,16 @@ cc_version: mk/cc.mk cxx_version: mk/cc.mk $(Q)echo "SPDK using CXX=$(CXX)"; $(CXX) -v +.libs_only_other: + $(Q)echo -n '$(SYS_LIBS) ' + $(Q)if [ "$(CONFIG_SHARED)" = "y" ]; then \ + echo -n '-lspdk '; \ + fi + +.ldflags: + $(Q)echo -n '$(LDFLAGS) ' + +ldflags: .ldflags .libs_only_other + $(Q)echo '' + include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/test/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh index 86c63959d..0051df1d1 100755 --- a/test/nvme/spdk_nvme_cli.sh +++ b/test/nvme/spdk_nvme_cli.sh @@ -33,12 +33,8 @@ ln -sf "$rootdir" "$spdk_nvme_cli/spdk" bdfs=$(iter_pci_class_code 01 08 02) bdf=$(echo $bdfs|awk '{ print $1 }') -if [[ -s $rootdir/CONFIG.local ]] && grep 'CONFIG_LOG_BACKTRACE\?=y' $rootdir/CONFIG.local -q; then - nvme_cli_ldflags='LDFLAGS=-lunwind' -fi - cd $spdk_nvme_cli -make clean && make -j$(nproc) $nvme_cli_ldflags +make clean && make -j$(nproc) LDFLAGS="$(make -s -C $spdk_nvme_cli/spdk ldflags)" sed -i 's/spdk=0/spdk=1/g' spdk.conf sed -i 's/shm_id=1/shm_id=0/g' spdk.conf ./nvme list