import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / examples / vhost_crypto / Makefile

diff --git a/ceph/src/spdk/dpdk/examples/vhost_crypto/Makefile b/ceph/src/spdk/dpdk/examples/vhost_crypto/Makefile
index 83d331012273ef85804dfddd049060236557c679..80af3de0c82c07dd334079b22905bd071fd91699 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/vhost_crypto/Makefile
+++ b/ceph/src/spdk/dpdk/examples/vhost_crypto/Makefile
@@ -5,13 +5,13 @@ ifeq ($(RTE_SDK),)
 $(error "Please define RTE_SDK environment variable")
 endif
 
-# Default target, can be overridden by command line or environment
-RTE_TARGET ?= x86_64-native-linuxapp-gcc
+# Default target, detect a build directory, by looking for a path with a .config
+RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)
-$(info This application can only operate in a linuxapp environment, \
+ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
+$(info This application can only operate in a linux environment, \
 please change the definition of the RTE_TARGET environment variable)
 all:
 else
@@ -25,7 +25,6 @@ SRCS-y := main.c
 CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += -O2 -D_FILE_OFFSET_BITS=64
 CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -D_GNU_SOURCE
 
 include $(RTE_SDK)/mk/rte.extapp.mk