lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

arch/Toolchain.defs: Don't expand EXTRA_LIBS immediately

Browse source 
since board's Make.defs may overwrite ARCHCPUFLAGS

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-01-29 18:02:53 +08:00 committed by Masayuki Ishikawa
parent 61acceb1ca
commit e0b62bf677
18 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/src/arm/Toolchain.defs
View file

@ -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}}

2
arch/arm/src/armv6-m/Toolchain.defs
View file

@ -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}}

2
arch/arm/src/armv7-a/Toolchain.defs
View file

@ -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}}

2
arch/arm/src/armv7-m/Toolchain.defs
View file

@ -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}}

2
arch/arm/src/armv7-r/Toolchain.defs
View file

@ -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}}

2
arch/arm/src/armv8-m/Toolchain.defs
View file

@ -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}}

2
arch/avr/src/avr/Toolchain.defs
View file

@ -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}}

2
arch/avr/src/avr32/Toolchain.defs
View file

@ -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}}

2
arch/hc/src/Makefile
View file

@ -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}}

2
arch/mips/src/mips32/Toolchain.defs
View file

@ -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}}

2
arch/misoc/src/lm32/Toolchain.defs
View file

@ -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}}

2
arch/misoc/src/minerva/Toolchain.defs
View file

@ -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}}

2
arch/or1k/src/mor1kx/Toolchain.defs
View file

@ -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}}

2
arch/risc-v/src/common/Toolchain.defs
View file

@ -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}}

2
arch/x86/src/Makefile
View file

@ -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}}

2
arch/x86_64/src/Makefile
View file

@ -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}}

2
arch/xtensa/src/lx6/Toolchain.defs
View file

@ -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}}

2
arch/xtensa/src/lx7/Toolchain.defs
View file

@ -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}}