buildman: using wrong libgcc.a

Message ID 545A5CB9.7090906@broadcom.com
State New
Headers show

Commit Message

Steve Rae Nov. 5, 2014, 5:22 p.m.
On 14-11-03 01:14 PM, Simon Glass wrote:
> Hi,
>
> On 30 October 2014 14:57, Jeroen Hofstee <jeroen@myspectrum.nl> wrote:
>> Hello Steve,
>>
>> On 30-10-14 21:42, Steve Rae wrote:
>>>
>>> Hmmmm -- maybe it would be better to specify the entire path for the
>>> CROSS_COMPILE, and not rely on the PATH to find the cross compile tools:
>>>
>>> diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
>>> index 27dc318..58c7b1f 100644
>>> --- a/tools/buildman/toolchain.py
>>> +++ b/tools/buildman/toolchain.py
>>> @@ -33,6 +33,7 @@ class Toolchain:
>>>           self.cross = os.path.basename(fname)[:-3]
>>>           pos = self.cross.find('-')
>>>           self.arch = self.cross[:pos] if pos != -1 else 'sandbox'
>>> +        self.cross = fname[:-3]
>>>
>>
>> A bit off topic, but is it possible to stop adding these magic 3
>> constants. strlen("clang") != 3. strlen("cc") isn't either. Anyway
>> I am aware buildman is already full with it, so I am fine with
>> one more (for now).
>
> This should be isolated to Toolchain. I'd be happy to have a fix that
> solves this once and for all. What is needed?
>
> Regards,
> Simon
>
( back to the original issue )

@@ -82,7 +83,6 @@ class Toolchain:
          """
          env = dict(os.environ)
          env['CROSS_COMPILE'] = self.cross
-        env['PATH'] += (':' + self.path)
          return env

This solves my problem, however, I have only built "arm" and "armv8" 
targets....
So I don't know whether it breaks any other environments.
How can we proceed?
Thanks, Steve

Patch

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 27dc318..58c7b1f 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -33,6 +33,7 @@  class Toolchain:
          self.cross = os.path.basename(fname)[:-3]
          pos = self.cross.find('-')
          self.arch = self.cross[:pos] if pos != -1 else 'sandbox'
+        self.cross = fname[:-3]

          env = self.MakeEnvironment()