summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2015-12-08 01:50:17 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-12-08 03:00:42 +0100
commit341a1e0664a1a55709af60dde6f76963de0d731d (patch)
treef83b54e9ce8c399a7168825edd52643535573fbe /mk
parentd90f09dbc748563b9fbbeff2a94d86f772a06e29 (diff)
downloaddpdk-341a1e0664a1a55709af60dde6f76963de0d731d.zip
dpdk-341a1e0664a1a55709af60dde6f76963de0d731d.tar.gz
dpdk-341a1e0664a1a55709af60dde6f76963de0d731d.tar.xz
mk: fix external library build when combine is enabled
The object files are copied to prepare the internal combined library. It must be disabled when building an external library. It has been seen because the directory was missing: examples/ethtool/lib/x86_64-native-linuxapp-gcc/build/lib: No such file or directory Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.lib.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk
index 3f026bf..24c81e7 100644
--- a/mk/rte.lib.mk
+++ b/mk/rte.lib.mk
@@ -138,7 +138,7 @@ endif
$(depfile_newer)),\
$(O_TO_S_DO))
-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)
+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(EXTLIB_BUILD),yn)
$(if $(or \
$(file_missing),\
$(call cmdline_changed,$(O_TO_C_STR)),\
@@ -161,7 +161,7 @@ $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE
$(depfile_missing),\
$(depfile_newer)),\
$(O_TO_A_DO))
-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)
+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(EXTLIB_BUILD),yn)
$(if $(or \
$(file_missing),\
$(call cmdline_changed,$(O_TO_C_STR)),\