PATCH: [zorg] Remove obsolete configure args from clang builder.
Rick Foos
rfoos at codeaurora.org
Thu Aug 22 12:22:48 PDT 2013
All is well, Galina did them both.
Thanks for checking up on it
-rick
---
Author: gkistanova
Date: Wed Aug 21 19:09:17 2013
New Revision: 188966
URL:http://llvm.org/viewvc/llvm-project?rev=188966&view=rev
Log:
Patch by Rick Foos!
Changed the clang-hexagon-elf builder to correctly use triple, build, and host configure options.
Removed obsolete options (--without-llvmgcc --without-llvmgxx) from the clang builder.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL:http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=188966&r1=188965&r2=188966&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Aug 21 19:09:17 2013
@@ -366,12 +366,12 @@ def _get_clang_builders():
{'name' : "clang-hexagon-elf",
'slavenames' :["hexagon-build-02"],
'builddir' :"clang-hexagon-elf",
- 'factory' : ClangBuilder.getClangBuildFactory(triple='hexagon-unknown-elf',
- stage1_config='Release+Asserts',
- extra_configure_args=['--build=x86_64-linux-gnu',
- '--host=x86_64-linux-gnu',
- '--target=hexagon-unknown-elf',
- '--enable-targets=hexagon'])},
+ 'factory' : ClangBuilder.getClangBuildFactory(
+ triple='x86_64-linux-gnu',
+ stage1_config='Release+Asserts',
+ extra_configure_args=['--enable-shared',
+ '--target=hexagon-unknown-elf',
+ '--enable-targets=hexagon'])},
]
# Offline.
Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL:http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=188966&r1=188965&r2=188966&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Aug 21 19:09:17 2013
@@ -157,8 +157,7 @@ def getClangBuildFactory(
if triple:
base_configure_args += ['--build=%s' % triple,
'--host=%s' % triple]
- args = base_configure_args + ["--without-llvmgcc", "--without-llvmgxx"]
- args.append(WithProperties("--prefix=%%(builddir)s/%s" % llvm_1_installdir))
+ args = base_configure_args + [WithProperties("--prefix=%%(builddir)s/%s" % llvm_1_installdir)]
args += builders_util.getConfigArgs(stage1_config)
if not clean:
f.addStep(SetProperty(name="Makefile_isready",
@@ -291,8 +290,7 @@ def getClangBuildFactory(
env=merged_env))
# Configure llvm (stage 2).
- args = base_configure_args + ["--without-llvmgcc", "--without-llvmgxx"]
- args.append(WithProperties("--prefix=%(builddir)s/" + llvm_2_installdir))
+ args = base_configure_args + [WithProperties("--prefix=%(builddir)s/" + llvm_2_installdir)]
args += builders_util.getConfigArgs(stage2_config)
local_env = dict(merged_env)
local_env.update({
@@ -738,8 +736,7 @@ def phasedClang(config_options, is_boots
# Construct the configure arguments.
configure_args = ['../llvm/configure']
configure_args.extend(config_options)
- configure_args.extend(['--disable-bindings', '--with-llvmcc=clang',
- '--without-llvmgcc', '--without-llvmgxx',
+ configure_args.extend(['--disable-bindings',
'--enable-keep-symbols'])
configure_args.append(
WithProperties('--prefix=%(builddir)s/clang-install'))
_______________________________________________
llvm-commits mailing list
llvm-commits at cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
On 08/22/2013 01:51 PM, Eric Christopher wrote:
> LGTM, I think Galina needs to commit or someone should tell me where
> the repository is ;)
>
> -eric
>
> On Wed, Aug 21, 2013 at 3:18 PM, Rick Foos <rfoos at codeaurora.org> wrote:
>> Hi Galina, Eric,
>>
>> Finally getting to this patch to remove obsolete options (--without-llvmgcc
>> --without-llvmgxx) from the clang builder.
>>
>> The patch was created/updated on r188940. I've been running with this on my
>> test site without any problems.
>>
>> There are a few more of obsolete options in LLDBBuilder.py, but my trivial
>> fix didn't pass testing so it's not included.
>>
>> (I need some help to commit this)
>>
>> Thanks!
>> Rick
>>
>>
>> On 07/30/2013 11:47 AM, Rick Foos wrote:
>>> On 07/29/2013 05:52 PM, Eric Christopher wrote:
>>>>> To reproduce, in a linux box, configure with:
>>>>>
>>>>> $ ../configure --disable-bindings --build=x86_64-linux-gnu
>>>>> --host=x86_64-linux-gnu --target=hexagon-unknown-elf
>>>>> --enable-targets=hexagon --build=hexagon-unknown-elf
>>>>> --host=hexagon-unknown-elf --without-llvmgcc --without-llvmgxx
>>>>> --enable-optimized --enable-assertions
>>>>> $ make && make check-all
>>>>>
>>>> FWIW your configure line is completely wrong :)
>>>>
>>>> --host/--target/--build shouldn't be set to hexagon-elf for a generic
>>>> linux build... well, you've got it set up twice which is just even
>>>> weirder.
>>>>
>>>> Also --without-llvmgcc/without-llvmgxx were removed a long time ago :)
>>>>
>>>> -eric
>>> Hi Eric,
>>>
>>> Thanks for calling me on that, yes the configure line is wrong.
>>>
>>> The --without's are coming from zorg ClangBuilder.
>>> I'll test a patch that removes the --without's for everyone, and one to
>>> correctly use triple on my buildslave.
>>>
>>> --rick
>>>
>>> Here's what I'm telling zorg:
>>> {'name' : "clang-hexagon-elf",
>>> 'slavenames' :["hexagon-build-02"],
>>> 'builddir' :"clang-hexagon-elf",
>>> 'factory' : ClangBuilder.getClangBuildFactory(
>>> triple='hexagon-unknown-elf',
>>> stage1_config='Release+Asserts',
>>> extra_configure_args=['--build=x86_64-linux-gnu',
>>> '--host=x86_64-linux-gnu',
>>> '--target=hexagon-unknown-elf',
>>> '--enable-targets=hexagon']
>>> )
>>> },
>>> Here's what I'm getting in buildbot:
>>> ./configure --disable-bindings --build=x86_64-linux-gnu
>>> --host=x86_64-linux-gnu --target=hexagon-unknown-elf
>>> --enable-targets=hexagon
>>>
>>> (zorg is adding this)
>>> --build=hexagon-unknown-elf --host=hexagon-unknown-elf --without-llvmgcc
>>> --without-llvmgxx
>>>
>>> --prefix=/local/buildbot/workspace/hexagon-build-02/slave/clang-hexagon-elf/None
>>> --enable-optimized --enable-assertions
>>>
>>>>> Thanks,
>>>>> Sebastian
>>>>>
>>>>> On Fri, Jul 26, 2013 at 6:22 PM, Rafael Espindola
>>>>> <rafael.espindola at gmail.com> wrote:
>>>>>> Author: rafael
>>>>>> Date: Fri Jul 26 18:22:43 2013
>>>>>> New Revision: 187271
>>>>>>
>>>>>> URL: http://llvm.org/viewvc/llvm-project?rev=187271&view=rev
>>>>>> Log:
>>>>>> Move the default back to pipefail. I accidentally reverted it before.
>>>>>>
>>>>>> Modified:
>>>>>> llvm/trunk/utils/lit/lit/TestingConfig.py
>>>>>>
>>>>>> Modified: llvm/trunk/utils/lit/lit/TestingConfig.py
>>>>>> URL:
>>>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestingConfig.py?rev=187271&r1=187270&r2=187271&view=diff
>>>>>>
>>>>>> ==============================================================================
>>>>>> --- llvm/trunk/utils/lit/lit/TestingConfig.py (original)
>>>>>> +++ llvm/trunk/utils/lit/lit/TestingConfig.py Fri Jul 26 18:22:43 2013
>>>>>> @@ -48,7 +48,7 @@ class TestingConfig:
>>>>>> test_source_root = None,
>>>>>> excludes = [],
>>>>>> available_features =
>>>>>> available_features,
>>>>>> - pipefail = False)
>>>>>> + pipefail = True)
>>>>>>
>>>>>> if os.path.exists(path):
>>>>>> # FIXME: Improve detection and error reporting of errors
>>>>>> in the
>>>>>>
>>>>>>
>>>>>> _______________________________________________
>>>>>> llvm-commits mailing list
>>>>>> llvm-commits at cs.uiuc.edu
>>>>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>>>
>>>>>
>>>>> --
>>>>> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
>>>>> hosted by The Linux Foundation
>>>>> _______________________________________________
>>>>> llvm-commits mailing list
>>>>> llvm-commits at cs.uiuc.edu
>>>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>> _______________________________________________
>>>> llvm-commits mailing list
>>>> llvm-commits at cs.uiuc.edu
>>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>
>>>
>>
>> --
>> Rick Foos
>> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
>> The Linux Foundation
>>
--
Rick Foos
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
More information about the llvm-commits
mailing list