[llvm-commits] [llvm] r81719 - in /llvm/trunk: unittests/Makefile unittests/TestMain.cpp utils/unittest/Makefile utils/unittest/UnitTestMain/ utils/unittest/UnitTestMain/Makefile utils/unittest/UnitTestMain/TestMain.cpp

[Daniel Dunbar]

On Fri, Sep 18, 2009 at 9:11 AM, Julien Lerouge <jlerouge at apple.com> wrote:
> On Sun, Sep 13, 2009 at 09:31:21PM +0000, Daniel Dunbar wrote:
>> Author: ddunbar
>> Date: Sun Sep 13 16:31:21 2009
>> New Revision: 81719
>>
>> ==============================================================================
>> --- llvm/trunk/unittests/Makefile (original)
>> +++ llvm/trunk/unittests/Makefile Sun Sep 13 16:31:21 2009
>> @@ -9,13 +9,6 @@
>>
>>  LEVEL = ..
>>
>> -include $(LEVEL)/Makefile.config
>> -
>> -LIBRARYNAME = UnitTestMain
>> -BUILD_ARCHIVE = 1
>> -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
>> -CPP.Flags += -Wno-variadic-macros
>> -
>>  PARALLEL_DIRS = ADT ExecutionEngine Support VMCore
>>
>>  include $(LEVEL)/Makefile.common
>>
>> Removed: llvm/trunk/unittests/TestMain.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TestMain.cpp?rev=81718&view=auto
>>
>> ==============================================================================
>> --- llvm/trunk/unittests/Makefile (original)
>> +++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Sun Sep 13 16:31:21 2009
>> @@ -16,9 +16,4 @@
>>  CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
>>  CPP.Flags += -Wno-variadic-macros
>>
>
> -Wno-variadic-macros is not supported with older GCC, can we re-use the
> logic in googletest/Makefile ? patch attached.

Ok, this was a preexisting problem with the unit test build but it
would be nice to fix. I don't think your patch is correct though, it
changes the flags in the utils/unittest but this isn't how recursive
make works, the builds in the subdirs just ignore those options which
means the build gets new warnings. I'll just duplicated the logic into
UnitTestMain for now, although it probably would be better to suck it
into the top level Makefile. r82373.

 - Daniel