Commit 34387ccc authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

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: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/428335


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 1c16c6c0

Makefile

+12 −0
Original line number Diff line number Diff line
@@ -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

test/nvme/spdk_nvme_cli.sh

+1 −5
Original line number Diff line number Diff line
@@ -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