From b8411b9fba58b2478f1d5297d97360a65b34543f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Tue, 26 May 2015 17:50:58 +0300 Subject: [PATCH] Fix emcmake script that broke in a regression from https://github.com/kripken/emscripten/pull/3447 to an error of not being able to concatenate str and list. --- emcmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/emcmake b/emcmake index 7bea9e8d0e313..e3baef0e88900 100755 --- a/emcmake +++ b/emcmake @@ -4,6 +4,10 @@ import os, subprocess, sys from tools import shared configure_path = shared.path_from_root('emconfigure') +node_js = shared.NODE_JS +if type(node_js) is list: node_js = ' '.join(node_js) +node_js = node_js.replace('"', '\"') + exit(subprocess.call([shared.PYTHON, configure_path] + \ - sys.argv[1] + \ - ['-DCMAKE_CROSSCOMPILING_EMULATOR=' + shared.NODE_JS] + sys.argv[2:])) + [sys.argv[1]] + \ + ['-DCMAKE_CROSSCOMPILING_EMULATOR="' + node_js +'"'] + sys.argv[2:]))