summaryrefslogtreecommitdiff
path: root/mk/exec-env
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2015-07-08 12:34:26 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-07-09 00:55:57 +0200
commite7c6d6fc2233782322ac6d0156f1b3dde3a19d6f (patch)
tree6776be91e95e697171868210ce6b20a9421e365a /mk/exec-env
parent40adab038db3584a2bb8b4a19c2d750f2b4f22ac (diff)
downloaddpdk-e7c6d6fc2233782322ac6d0156f1b3dde3a19d6f.zip
dpdk-e7c6d6fc2233782322ac6d0156f1b3dde3a19d6f.tar.gz
dpdk-e7c6d6fc2233782322ac6d0156f1b3dde3a19d6f.tar.xz
mk: remove variables identical to config ones
CONFIG_RTE_BUILD_SHARED_LIB and CONFIG_RTE_BUILD_COMBINE_LIBS does not have quotes in their values (only y or n). That's why the variables RTE_BUILD_SHARED_LIB and RTE_BUILD_COMBINE_LIBS are always identical to their CONFIG_ counterpart, and are useless. In order to have consistent naming of config options in the makefiles, these options are removed and the "CONFIG_ prefixed" variables are used. Fixes: e25e4d7ef16b ("mk: shared libraries") Fixes: 4d3d79e7a5c6 ("mk: combined library") Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Acked-by: Neil Horman <nhorman@tuxdriver.com>
Diffstat (limited to 'mk/exec-env')
-rw-r--r--mk/exec-env/bsdapp/rte.vars.mk4
-rw-r--r--mk/exec-env/linuxapp/rte.vars.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk
index aed0e18..47a673e 100644
--- a/mk/exec-env/bsdapp/rte.vars.mk
+++ b/mk/exec-env/bsdapp/rte.vars.mk
@@ -39,7 +39,7 @@
#
# examples for RTE_EXEC_ENV: linuxapp, bsdapp
#
-ifeq ($(RTE_BUILD_SHARED_LIB),y)
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
EXECENV_CFLAGS = -pthread -fPIC
else
EXECENV_CFLAGS = -pthread
@@ -49,7 +49,7 @@ EXECENV_LDFLAGS =
EXECENV_LDLIBS = -lexecinfo
EXECENV_ASFLAGS =
-ifeq ($(RTE_BUILD_SHARED_LIB),y)
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
EXECENV_LDLIBS += -lgcc_s
endif
diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk
index e5af318..5fd7d85 100644
--- a/mk/exec-env/linuxapp/rte.vars.mk
+++ b/mk/exec-env/linuxapp/rte.vars.mk
@@ -39,7 +39,7 @@
#
# examples for RTE_EXEC_ENV: linuxapp, bsdapp
#
-ifeq ($(RTE_BUILD_SHARED_LIB),y)
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
EXECENV_CFLAGS = -pthread -fPIC
else
EXECENV_CFLAGS = -pthread
@@ -51,7 +51,7 @@ EXECENV_LDFLAGS = --no-as-needed
EXECENV_LDLIBS = -lrt -lm
EXECENV_ASFLAGS =
-ifeq ($(RTE_BUILD_SHARED_LIB),y)
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
EXECENV_LDLIBS += -lgcc_s
endif