diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-12-26 12:12:17 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-12-26 12:13:06 -0800 |
| commit | 39165e9e511da3c041865d7e343c81e6d7cafd6c (patch) | |
| tree | 8a9cad78b4650cf1f223fb02d9fa325f74f02c28 | |
| parent | 9f609a10bfe90202d6e9d15216c502d6aa18bbcb (diff) | |
fix js libraries in fastcomp; fixes #1948
| -rw-r--r-- | src/compiler.js | 2 | ||||
| -rw-r--r-- | tests/test_other.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler.js b/src/compiler.js index 7d768c3d..e4ce1c88 100644 --- a/src/compiler.js +++ b/src/compiler.js @@ -134,7 +134,7 @@ load('settings.js'); var settings_file = arguments_[0]; var ll_file = arguments_[1]; phase = arguments_[2]; -if (phase == 'pre') { +if (phase == 'pre' || phase == 'glue') { additionalLibraries = Array.prototype.slice.call(arguments_, 3); } else { var forwardedDataFile = arguments_[3]; diff --git a/tests/test_other.py b/tests/test_other.py index 0c325c74..df9e2da5 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -1165,7 +1165,7 @@ f.close() ''') Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.cpp'), '--js-library', os.path.join(self.get_dir(), 'mylib1.js'), - '--js-library', os.path.join(self.get_dir(), 'mylib2.js')]).communicate() + '--js-library', os.path.join(self.get_dir(), 'mylib2.js')]).communicate() self.assertContained('hello from lib!\n*32*\n', run_js(os.path.join(self.get_dir(), 'a.out.js'))) def test_identical_basenames(self): |