import 15.2.0 Octopus source

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

diff --git a/ceph/src/spdk/dpdk/examples/qos_sched/Makefile b/ceph/src/spdk/dpdk/examples/qos_sched/Makefile
index a7ecf978812576ba77269d22aab96905d14058f1..a25875900e1d6f39615b15b953bc0f03b2e24db9 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/qos_sched/Makefile
+++ b/ceph/src/spdk/dpdk/examples/qos_sched/Makefile
@@ -43,13 +43,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:
 clean:
@@ -57,8 +57,6 @@ else
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
-CFLAGS_args.o := -D_GNU_SOURCE
-CFLAGS_cfg_file.o := -D_GNU_SOURCE
 
 include $(RTE_SDK)/mk/rte.extapp.mk