summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Courtat <julien.courtat@6wind.com>2013-11-15 15:22:37 +0100
committerDavid Marchand <david.marchand@6wind.com>2014-02-26 11:01:13 +0100
commit0ca5de1ebfa461a8633465a5e177a34e4a98f168 (patch)
tree83d327df7869cdbe8e86061410aa9cd627a5c48c
parent5125f7652c92ad8e37893b953a735dc5e0e97b66 (diff)
downloaddpdk-0ca5de1ebfa461a8633465a5e177a34e4a98f168.zip
dpdk-0ca5de1ebfa461a8633465a5e177a34e4a98f168.tar.gz
dpdk-0ca5de1ebfa461a8633465a5e177a34e4a98f168.tar.xz
mk: fix EXTRA_LDFLAGS override
The GCC prefix -Wl was ignored because the command line value has higher priority. It ended in impossibilty for GCC to pass parameters to LD. The prefixed value must override the command line one. Signed-off-by: Julien Courtat <julien.courtat@6wind.com> Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--mk/rte.app.mk2
-rw-r--r--mk/rte.shared.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index bdb55f1..aab10d1 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -198,7 +198,7 @@ ifeq ($(LINK_USING_CC),1)
comma := ,
LDLIBS := $(addprefix -Wl$(comma),$(LDLIBS))
LDFLAGS := $(addprefix -Wl$(comma),$(LDFLAGS))
-EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
+override EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \
-Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDLIBS)
else
diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk
index 7a3a78f..e9be02d 100644
--- a/mk/rte.shared.mk
+++ b/mk/rte.shared.mk
@@ -61,7 +61,7 @@ ifeq ($(LINK_USING_CC),1)
comma := ,
LDLIBS := $(addprefix -Wl$(comma),$(LDLIBS))
LDFLAGS := $(addprefix -Wl$(comma),$(LDFLAGS))
-EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
+override EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
O_TO_SO = $(CC) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-shared -o $@ $(OBJS-y) $(LDLIBS)
else