You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/01/30 02:04:42 UTC
[incubator-nuttx] branch master updated: arch/Toolchain.defs: Don't expand EXTRA_LIBS immediately
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new e0b62bf arch/Toolchain.defs: Don't expand EXTRA_LIBS immediately
e0b62bf is described below
commit e0b62bf677340dbaa472ad8c535d0483cbf65cf7
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Jan 29 18:02:53 2022 +0800
arch/Toolchain.defs: Don't expand EXTRA_LIBS immediately
since board's Make.defs may overwrite ARCHCPUFLAGS
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/arm/Toolchain.defs | 2 +-
arch/arm/src/armv6-m/Toolchain.defs | 2 +-
arch/arm/src/armv7-a/Toolchain.defs | 2 +-
arch/arm/src/armv7-m/Toolchain.defs | 2 +-
arch/arm/src/armv7-r/Toolchain.defs | 2 +-
arch/arm/src/armv8-m/Toolchain.defs | 2 +-
arch/avr/src/avr/Toolchain.defs | 2 +-
arch/avr/src/avr32/Toolchain.defs | 2 +-
arch/hc/src/Makefile | 2 +-
arch/mips/src/mips32/Toolchain.defs | 2 +-
arch/misoc/src/lm32/Toolchain.defs | 2 +-
arch/misoc/src/minerva/Toolchain.defs | 2 +-
arch/or1k/src/mor1kx/Toolchain.defs | 2 +-
arch/risc-v/src/common/Toolchain.defs | 2 +-
arch/x86/src/Makefile | 2 +-
arch/x86_64/src/Makefile | 2 +-
arch/xtensa/src/lx6/Toolchain.defs | 2 +-
arch/xtensa/src/lx7/Toolchain.defs | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index 4a714f1..5e9eee9 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -103,7 +103,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index 876d7fd..682850c 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -95,7 +95,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs
index 09cebaf..702d439 100644
--- a/arch/arm/src/armv7-a/Toolchain.defs
+++ b/arch/arm/src/armv7-a/Toolchain.defs
@@ -121,7 +121,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index de00011..43c2205 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -154,7 +154,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs
index 0c4834f..2db3c8c 100644
--- a/arch/arm/src/armv7-r/Toolchain.defs
+++ b/arch/arm/src/armv7-r/Toolchain.defs
@@ -103,7 +103,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index 805a751..07c7f7b 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -153,7 +153,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs
index 8e11c31..9816aac 100644
--- a/arch/avr/src/avr/Toolchain.defs
+++ b/arch/avr/src/avr/Toolchain.defs
@@ -126,7 +126,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/avr/src/avr32/Toolchain.defs b/arch/avr/src/avr32/Toolchain.defs
index b277d6a..e93de59 100644
--- a/arch/avr/src/avr32/Toolchain.defs
+++ b/arch/avr/src/avr32/Toolchain.defs
@@ -50,7 +50,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 1ff59a3..c686aee 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -87,7 +87,7 @@ endif
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs
index 712c3c4..e0c3410 100644
--- a/arch/mips/src/mips32/Toolchain.defs
+++ b/arch/mips/src/mips32/Toolchain.defs
@@ -279,7 +279,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs
index 5333d34..e4ec7e5 100644
--- a/arch/misoc/src/lm32/Toolchain.defs
+++ b/arch/misoc/src/lm32/Toolchain.defs
@@ -87,7 +87,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/misoc/src/minerva/Toolchain.defs b/arch/misoc/src/minerva/Toolchain.defs
index 7944867..0c45a4d 100644
--- a/arch/misoc/src/minerva/Toolchain.defs
+++ b/arch/misoc/src/minerva/Toolchain.defs
@@ -41,7 +41,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/or1k/src/mor1kx/Toolchain.defs b/arch/or1k/src/mor1kx/Toolchain.defs
index 8a509e2..05a0193 100644
--- a/arch/or1k/src/mor1kx/Toolchain.defs
+++ b/arch/or1k/src/mor1kx/Toolchain.defs
@@ -68,7 +68,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index ca62e9f..1882c70 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -129,7 +129,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index a355695..ab9463a 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -84,7 +84,7 @@ endif
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index 3eb9ed5..01aeee3 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -86,7 +86,7 @@ endif
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs
index 80c82d7..3e1e02a 100644
--- a/arch/xtensa/src/lx6/Toolchain.defs
+++ b/arch/xtensa/src/lx6/Toolchain.defs
@@ -79,7 +79,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
diff --git a/arch/xtensa/src/lx7/Toolchain.defs b/arch/xtensa/src/lx7/Toolchain.defs
index 705fa1c..e65cc64 100644
--- a/arch/xtensa/src/lx7/Toolchain.defs
+++ b/arch/xtensa/src/lx7/Toolchain.defs
@@ -79,7 +79,7 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS := ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
+EXTRA_LIBS = ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libgcc.a}
ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}