git.iko.soy/unity8
on xenial help sign in
Use dpkg-architecture, not gcc, to determine the machine triplet.
c8f7ab3Michał Sawicz
cmake/modules/QmlTest.cmake+3−3
compare with xenial
unifiedsplit
@@ -111,9 +111,9 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
111 -o -,txt
111 -o -,txt
112 ${function_ARGS}
112 ${function_ARGS}
113 )
113 )
114− find_program( HAVE_GCC gcc )
114+ find_program(DPKG dpkg-architecture)
115− if (NOT ${HAVE_GCC} STREQUAL "")
115+ if(DPKG)
116− exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
116+ exec_program(${DPKG} ARGS "-qDEB_BUILD_MULTIARCH" OUTPUT_VARIABLE ARCH_TRIPLET )
117 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
117 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
118 endif()
118 endif()
119 set(qmltest_xvfb_command
119 set(qmltest_xvfb_command