From dda257ce657d05a88adb8e9db6ef299591306a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Wed, 18 Mar 2015 14:22:48 +0200 Subject: [PATCH] Abort on build_fastcomp_tool() failures early. Fixes https://github.com/kripken/emscripten/issues/3267 . --- emsdk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/emsdk b/emsdk index 4b10c91..26690a4 100755 --- a/emsdk +++ b/emsdk @@ -507,9 +507,11 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg def build_fastcomp_tool(tool): fastcomp_root = tool.installation_path() fastcomp_src_root = os.path.join(fastcomp_root, 'src') - git_clone_checkout_and_pull(tool.url, fastcomp_src_root, tool.git_branch) + success = git_clone_checkout_and_pull(tool.url, fastcomp_src_root, tool.git_branch) + if not success: return False clang_root = os.path.join(fastcomp_src_root, 'tools/clang') - git_clone_checkout_and_pull(tool.clang_url, clang_root, tool.git_branch) + success = git_clone_checkout_and_pull(tool.clang_url, clang_root, tool.git_branch) + if not success: return False cmake_generator = CMAKE_GENERATOR if 'Visual Studio' in CMAKE_GENERATOR and tool.bitness == 64: cmake_generator += ' Win64'