Paul Floyd wrote:
> Adriaan de Groot wrote:
>
>
>>>2. Error in Makefile for qatomic.o. Edited the makefile and deleted the
>>>2nd rule. Deleted qatomic.o, rebuilt.
>>
>>
>>Yup. Thiago doesn't know why this happens either.
>
> This is probably within my capabilities, I know qmake quite well.
thread/thread.pri contains
SOURCES += thread/qatomic.cpp \
so a rule to make qatomic.o from thread/qatomic.cpp will be generated in
the makefile, unconditionally.
arch.pri includes $$QT_ARCH_CPP/arch.pri, which I presume means
arch/i386/arch.pri, which includes
!*-g++*:!*-icc*:SOURCES += $$QT_ARCH_CPP/qatomic.s
So for compilers other than GCC and Intel, a rule to make qatomic.o from
arch/i386/qatomic.s is generated.
I'm not sure of the best way to fix it. Something like this in
thread/thread.pri
*-g++* {
SOURCES += thread/qatomic.cpp
}
*-icc* {
SOURCES += thread/qatomic.cpp
}
I don't like the duplication, but I don't know of a way to perform a
logical or with scopes like
*-g++* || *-icc* {
SOURCES += thread/qatomic.cpp
}
A bientot
Paul
