1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
Fix makefiles.
Signed-off-by: Costin Popescu <costin.popescu@enea.com>
Upstream-Status: Pending
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index d90a0b0..93f1dd9 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -203,6 +203,7 @@ endif
ifeq ($(LINK_USING_CC),1)
comma := ,
+LDFLAGS := $(patsubst -Wl$(comma)%,%,$(LDFLAGS))
LDLIBS := $(addprefix -Wl$(comma),$(LDLIBS))
LDFLAGS := $(addprefix -Wl$(comma),$(LDFLAGS))
override EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
index a163272..9fb07d8 100644
--- a/mk/target/generic/rte.vars.mk
+++ b/mk/target/generic/rte.vars.mk
@@ -107,7 +107,7 @@ ifeq ($(KERNELRELEASE),)
include $(RTE_SDK)/mk/rte.cpuflags.mk
# merge all CFLAGS
-CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
+CFLAGS += $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
CFLAGS += $(TARGET_CFLAGS) $(EXTERNAL_LIB_CFLAGS)
# merge all LDFLAGS
@@ -115,7 +115,7 @@ LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFL
LDFLAGS += $(TARGET_LDFLAGS)
# merge all ASFLAGS
-ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
+ASFLAGS += $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
ASFLAGS += $(TARGET_ASFLAGS)
# add default include and lib paths
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
index 0edb93f..adba7d4 100644
--- a/mk/toolchain/gcc/rte.vars.mk
+++ b/mk/toolchain/gcc/rte.vars.mk
@@ -40,21 +40,20 @@
# examples for RTE_TOOLCHAIN: gcc, icc
#
-CC = $(CROSS)gcc
-CPP = $(CROSS)cpp
-# for now, we don't use as but nasm.
-# AS = $(CROSS)as
-AS = nasm
-AR = $(CROSS)ar
-LD = $(CROSS)ld
-OBJCOPY = $(CROSS)objcopy
-OBJDUMP = $(CROSS)objdump
-STRIP = $(CROSS)strip
-READELF = $(CROSS)readelf
-GCOV = $(CROSS)gcov
+CC ?= $(CROSS)gcc
+CPP ?= $(CROSS)cpp
+AS ?= $(CROSS)as
+#AS ?= nasm
+AR ?= $(CROSS)ar
+LD ?= $(CROSS)ld
+OBJCOPY ?= $(CROSS)objcopy
+OBJDUMP ?= $(CROSS)objdump
+STRIP ?= $(CROSS)strip
+READELF ?= $(CROSS)readelf
+GCOV ?= $(CROSS)gcov
-HOSTCC = gcc
-HOSTAS = as
+HOSTCC ?= gcc
+HOSTAS ?= as
TOOLCHAIN_ASFLAGS =
TOOLCHAIN_CFLAGS =
@@ -68,7 +67,7 @@ ifeq (,$(findstring -O0,$(EXTRA_CFLAGS)))
endif
endif
-WERROR_FLAGS := -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
+WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
|
