Skip to content

Commit

Permalink
Don't set no_clang_integrated_as for the disabled pixman asm on clang…
Browse files Browse the repository at this point in the history
…/mingw

There's no external arm assembler to fall back on here. The
actual assembly is already disabled since 8072c36,
but passing the empty assembly file to any random external
assembler could end up producing an empty object file for the
host environment instead of the target, in a cross build.

This wasn't an issue as long as the clang compiler only was identified
as g++ within mkspecs, making no_clang_integrated_as a no-op. If
the mkspec actually identifies it as clang, this config can't
be added here.

Change-Id: I0f20b9b2a8d13b5e7e1b654e391d88b639c031bf
Reviewed-by: Allan Sandfeld Jensen <[email protected]>
  • Loading branch information
mstorsjo committed Jan 24, 2018
1 parent e39a9de commit f7524d7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/gui/painting/painting.pri
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ AVX2_SOURCES += painting/qdrawhelper_avx2.cpp
NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
NEON_HEADERS += painting/qdrawhelper_neon_p.h
NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S
!uikit:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as
!uikit:!win32:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as
!uikit:!win32:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS

MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp
Expand Down

0 comments on commit f7524d7

Please sign in to comment.