[PATCH] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty

[PATCH] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty

[Khem Raj]

We allow to set LINKER_HASH_STYLE to be empty so this would fail
since --with-linker-hash-style needs an argument and cant be empty

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc
index d56d2c5e06..cc428ad3ef 100644
--- a/meta/recipes-devtools/gcc/gcc-7.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-7.3.inc
@@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\
     --disable-bootstrap \
     --disable-libmudflap \
     --with-system-zlib \
-    --with-linker-hash-style=${LINKER_HASH_STYLE} \
+    ${@['','--with-linker-hash-style=${LINKER_HASH_STYLE}'][d.getVar('LINKER_HASH_STYLE') != '']} \
     --enable-linker-build-id \
     --with-ppl=no \
     --with-cloog=no \
-- 
2.16.2

Re: [PATCH] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

On Wed, Mar 14, 2018 at 6:48 PM, Khem Raj <raj.khem@gmail.com> wrote:

> We allow to set LINKER_HASH_STYLE to be empty so this would fail
> since --with-linker-hash-style needs an argument and cant be empty
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc
> b/meta/recipes-devtools/gcc/gcc-7.3.inc
> index d56d2c5e06..cc428ad3ef 100644
> --- a/meta/recipes-devtools/gcc/gcc-7.3.inc
> +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc
> @@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\
>      --disable-bootstrap \
>      --disable-libmudflap \
>      --with-system-zlib \
> -    --with-linker-hash-style=${LINKER_HASH_STYLE} \
> +    ${@['','--with-linker-hash-style=${LINKER_HASH_STYLE}'][d.getVar('LINKER_HASH_STYLE')
> != '']} \
>

That syntax was a hack around the fact that python didn’t have inline if
statements at the time we started the project, but it does now:

    ${@‘—with-linker-hash-style=${LINKER_HASH_STYLE}’ if
‘${LINKER_HASH_STYLE}’ else ‘'}
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 1925 bytes --]

Re: [PATCH] gcc: Do not use --with-linker-hash-style if LINKER_HASH_STYLE is empty

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]

On Wed, Mar 14, 2018 at 6:57 PM Christopher Larson <kergoth@gmail.com>
wrote:

> On Wed, Mar 14, 2018 at 6:48 PM, Khem Raj <raj.khem@gmail.com> wrote:
>
>> We allow to set LINKER_HASH_STYLE to be empty so this would fail
>> since --with-linker-hash-style needs an argument and cant be empty
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  meta/recipes-devtools/gcc/gcc-7.3.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc
>> b/meta/recipes-devtools/gcc/gcc-7.3.inc
>> index d56d2c5e06..cc428ad3ef 100644
>> --- a/meta/recipes-devtools/gcc/gcc-7.3.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc
>> @@ -100,7 +100,7 @@ EXTRA_OECONF_BASE = "\
>>      --disable-bootstrap \
>>      --disable-libmudflap \
>>      --with-system-zlib \
>> -    --with-linker-hash-style=${LINKER_HASH_STYLE} \
>> +
>> ${@['','--with-linker-hash-style=${LINKER_HASH_STYLE}'][d.getVar('LINKER_HASH_STYLE')
>> != '']} \
>>
>
> That syntax was a hack around the fact that python didn’t have inline if
> statements at the time we started the project, but it does now:
>
>     ${@‘—with-linker-hash-style=${LINKER_HASH_STYLE}’ if
> ‘${LINKER_HASH_STYLE}’ else ‘'}
>

Yes that looks more elegant I will test it out and send another patch

> --
> Christopher Larson
> kergoth at gmail dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Senior Software Engineer, Mentor Graphics
>

[-- Attachment #2: Type: text/html, Size: 2617 bytes --]