From 6600588cc78ab853cf9248f673d8125ff62f6cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Mon, 7 Jul 2014 13:52:45 +0300 Subject: [PATCH] Add SDK items for linux and fix an issue with extra tools being shown on linux. --- emsdk | 2 +- emsdk_manifest.json | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/emsdk b/emsdk index ad25895..a6d4764 100755 --- a/emsdk +++ b/emsdk @@ -643,7 +643,7 @@ class Tool: if WINDOWS and (hasattr(self, 'windows_url') or hasattr(self, 'windows_install_path')): return True - if LINUX or OSX and hasattr(self, 'unix_url'): + if (LINUX or OSX) and hasattr(self, 'unix_url'): return True return hasattr(self, 'url') diff --git a/emsdk_manifest.json b/emsdk_manifest.json index d855576..2559816 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -452,6 +452,12 @@ "uses": ["clang-incoming-64bit", "node-0.10.18-64bit", "emscripten-incoming"], "os": "osx" }, + { + "version": "incoming", + "bitness": 64, + "uses": ["clang-incoming-64bit", "emscripten-incoming"], + "os": "linux" + }, { "version": "master", "bitness": 32, @@ -470,6 +476,12 @@ "uses": ["clang-master-64bit", "node-0.10.18-64bit", "emscripten-master"], "os": "osx" }, + { + "version": "master", + "bitness": 64, + "uses": ["clang-master-64bit", "emscripten-master"], + "os": "linux" + }, { "version": "1.5.6", "bitness": 32,