| Message ID | 6016a687f8d76f66626d4b28bbf87dd4eab02f91.1572079551.git.yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/9] core/legal-info: don't require overriding _LICENSE | expand |
On 26/10/2019 10:45, Yann E. MORIN wrote: > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > --- > package/gcc/gcc-final/gcc-final.mk | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk > index 79c88a5d60..30fb87856c 100644 > --- a/package/gcc/gcc-final/gcc-final.mk > +++ b/package/gcc/gcc-final/gcc-final.mk > @@ -64,18 +64,16 @@ HOST_GCC_FINAL_CONF_OPTS = \ > --enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \ > --with-build-time-tools=$(HOST_DIR)/$(GNU_TARGET_NAME)/bin > > -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* > # The kernel wants to use the -m4-nofpu option to make sure that it > # doesn't use floating point operations. > ifeq ($(BR2_sh4)$(BR2_sh4eb),y) > HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu" > -# check-package OverriddenVariable > HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* > -endif > -ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) > +else ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) > HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu" > -# check-package OverriddenVariable Note that this was the last user of OverriddenVariable, so maybe we should remove support for it? Regards, Arnout > HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* > +else > +HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* > endif > > ifeq ($(BR2_GCC_SUPPORTS_LIBCILKRTS),y) >
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 79c88a5d60..30fb87856c 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -64,18 +64,16 @@ HOST_GCC_FINAL_CONF_OPTS = \ --enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \ --with-build-time-tools=$(HOST_DIR)/$(GNU_TARGET_NAME)/bin -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* # The kernel wants to use the -m4-nofpu option to make sure that it # doesn't use floating point operations. ifeq ($(BR2_sh4)$(BR2_sh4eb),y) HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu" -# check-package OverriddenVariable HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* -endif -ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) +else ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu" -# check-package OverriddenVariable HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* +else +HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* endif ifeq ($(BR2_GCC_SUPPORTS_LIBCILKRTS),y)
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> --- package/gcc/gcc-final/gcc-final.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)