CMake: Set DEPOT_TOOLS_WIN_TOOLCHAIN to 0 before running update and setup_links

This commit is contained in:
Axel Isouard 2016-12-04 11:20:09 +01:00
parent 499ccf20e1
commit 2d1dd68e00
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29

View file

@ -1,8 +1,6 @@
include(Common) include(Common)
include(ExternalProject) include(ExternalProject)
set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} "0")
ExternalProject_Add(chromium ExternalProject_Add(chromium
URL ${LIBWEBRTC_CHROMIUM_DEPS} URL ${LIBWEBRTC_CHROMIUM_DEPS}
URL_HASH MD5=cf057cf1d0919940ad1e68a829a80f2d URL_HASH MD5=cf057cf1d0919940ad1e68a829a80f2d
@ -24,9 +22,9 @@ if (UNIX AND NOT APPLE)
set(RETRIEVE_SYSROOT_COMMAND ${CMAKE_BINARY_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=amd64) set(RETRIEVE_SYSROOT_COMMAND ${CMAKE_BINARY_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=amd64)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)
set(UPDATE_CLANG_COMMAND ${PYTHON_EXECUTABLE} src/chromium/src/tools/clang/scripts/update.py) set(UPDATE_CLANG_COMMAND cmake -E env "DEPOT_TOOLS_WIN_TOOLCHAIN=0" ${PYTHON_EXECUTABLE} src/chromium/src/tools/clang/scripts/update.py)
set(SETUP_LINKS_COMMAND ${PYTHON_EXECUTABLE} src/setup_links.py) set(SETUP_LINKS_COMMAND cmake -E env "DEPOT_TOOLS_WIN_TOOLCHAIN=0" ${PYTHON_EXECUTABLE} src/setup_links.py)
ExternalProject_Add(webrtc-src ExternalProject_Add(webrtc-src
DEPENDS chromium DEPENDS chromium