patches/uClibc/0.9.32/150-Rules.mak-Rearrange-appending-UCLIBC_EXTRA_CFLAGS-to-CFLAGS.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
branch1.17
changeset 3129 b8e00eab8f81
permissions -rw-r--r--
scripts: fail on ':' in paths

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536
(transplanted from 15cd5dc25929d0ccd0e1f187fe721a1ca0d48919)
     1 commit 4642f4eead07080bf46b6d67b873d303eda9fb48
     2 Author: Khem Raj <raj.khem@gmail.com>
     3 Date:   Sat Jun 11 00:15:02 2011 -0700
     4 
     5     Rules.mak: Rearrange appending UCLIBC_EXTRA_CFLAGS to CFLAGS
     6     
     7     UCLIBC_EXTRA_CFLAGS is currently added before the OPTIMIZATION flags
     8     and OPTIMIZATION is chosen to be Os by default. But in OE we pass the optimisation
     9     flags through UCLIBC_EXTRA_CFLAGS but they are not effective since -Os is
    10     specified at last. So we need to change the order of these option flags
    11     
    12     Signed-off-by: Khem Raj <raj.khem@gmail.com>
    13     Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
    14 
    15 diff --git a/Rules.mak b/Rules.mak
    16 index a00deea..6b8f5b2 100644
    17 --- a/Rules.mak
    18 +++ b/Rules.mak
    19 @@ -585,9 +585,6 @@ CFLAGS := -include $(top_srcdir)include/libc-symbols.h \
    20  	-nostdinc -I$(top_builddir)include -I$(top_srcdir)include -I. \
    21  	-I$(top_srcdir)libc/sysdeps/linux \
    22  	-I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
    23 -ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
    24 -CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
    25 -endif
    26  
    27  # We need this to be checked within libc-symbols.h
    28  ifneq ($(HAVE_SHARED),y)
    29 @@ -633,6 +630,9 @@ LDFLAGS += -Wl,-s
    30  else
    31  STRIPTOOL := true -Stripping_disabled
    32  endif
    33 +ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
    34 +CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
    35 +endif
    36  
    37  ifeq ($(DOMULTI),y)
    38  # we try to compile all sources at once into an object (IMA), but