Patchwork configure: allow user to override cflags.

login
register
mail settings
Submitter Tristan Gingold
Date Feb. 7, 2011, 2:05 p.m.
Message ID <1297087545-1942-1-git-send-email-gingold@adacore.com>
Download mbox | patch
Permalink /patch/82136/
State New
Headers show

Comments

Tristan Gingold - Feb. 7, 2011, 2:05 p.m.
In order to allow user to override cflags, predefined flags must be inserted
before user cflags.

Signed-off-by: Tristan Gingold <gingold@adacore.com>
---
 configure |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Anthony Liguori - Feb. 7, 2011, 2:57 p.m.
On 02/07/2011 08:05 AM, Tristan Gingold wrote:
> In order to allow user to override cflags, predefined flags must be inserted
> before user cflags.
>
> Signed-off-by: Tristan Gingold<gingold@adacore.com>
>    

I think there's a very specific reason we do it this way but I cannot 
remember at the moment.

Regards,

Anthony Liguori

> ---
>   configure |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 598e8e1..f18ed0d 100755
> --- a/configure
> +++ b/configure
> @@ -939,8 +939,10 @@ cat>  $TMPC<<  EOF
>   int main(void) { return 0; }
>   EOF
>   for flag in $gcc_flags; do
> -    if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
> -	QEMU_CFLAGS="$QEMU_CFLAGS $flag"
> +    if compile_prog "-Werror $flag $QEMU_CFLAGS" "" ; then
> +        # Note: flag must be prepended so that they could be overriden by
> +        # user flags (such as -fno-stack-protector)
> +	QEMU_CFLAGS="$flag $QEMU_CFLAGS"
>       fi
>   done
>
>
Markus Armbruster - Feb. 7, 2011, 3:08 p.m.
Anthony Liguori <anthony@codemonkey.ws> writes:

> On 02/07/2011 08:05 AM, Tristan Gingold wrote:
>> In order to allow user to override cflags, predefined flags must be inserted
>> before user cflags.
>>
>> Signed-off-by: Tristan Gingold<gingold@adacore.com>
>>    
>
> I think there's a very specific reason we do it this way but I cannot
> remember at the moment.

Commit 1e027be7e91d854d7a0132e4a32bdf222c33dcfe perhaps?

>
> Regards,
>
> Anthony Liguori
>
>> ---
>>   configure |    6 ++++--
>>   1 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 598e8e1..f18ed0d 100755
>> --- a/configure
>> +++ b/configure
>> @@ -939,8 +939,10 @@ cat>  $TMPC<<  EOF
>>   int main(void) { return 0; }
>>   EOF
>>   for flag in $gcc_flags; do
>> -    if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
>> -	QEMU_CFLAGS="$QEMU_CFLAGS $flag"
>> +    if compile_prog "-Werror $flag $QEMU_CFLAGS" "" ; then
>> +        # Note: flag must be prepended so that they could be overriden by
>> +        # user flags (such as -fno-stack-protector)
>> +	QEMU_CFLAGS="$flag $QEMU_CFLAGS"
>>       fi
>>   done
>>
>>
Tristan Gingold - Feb. 7, 2011, 3:13 p.m.
On Feb 7, 2011, at 4:08 PM, Markus Armbruster wrote:

> Anthony Liguori <anthony@codemonkey.ws> writes:
> 
>> On 02/07/2011 08:05 AM, Tristan Gingold wrote:
>>> In order to allow user to override cflags, predefined flags must be inserted
>>> before user cflags.
>>> 
>>> Signed-off-by: Tristan Gingold<gingold@adacore.com>
>>> 
>> 
>> I think there's a very specific reason we do it this way but I cannot
>> remember at the moment.
> 
> Commit 1e027be7e91d854d7a0132e4a32bdf222c33dcfe perhaps?

Ah, thanks.  I then have to deal with -Wall.

Tristan.

Patch

diff --git a/configure b/configure
index 598e8e1..f18ed0d 100755
--- a/configure
+++ b/configure
@@ -939,8 +939,10 @@  cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
 for flag in $gcc_flags; do
-    if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
-	QEMU_CFLAGS="$QEMU_CFLAGS $flag"
+    if compile_prog "-Werror $flag $QEMU_CFLAGS" "" ; then
+        # Note: flag must be prepended so that they could be overriden by
+        # user flags (such as -fno-stack-protector)
+	QEMU_CFLAGS="$flag $QEMU_CFLAGS"
     fi
 done