diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-07-27 14:07:43 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-07-27 14:07:43 -0700 |
| commit | 943f5a9c567d8c273334c2651183024b6cbe4eb4 (patch) | |
| tree | d99d820bf8abfc4697f8b6cdc0625a3e7c381c96 | |
| parent | 96cdbee9649d440161cff3088ca2a82ec1e54c78 (diff) | |
| parent | 6b20729a183007e50b2fdf5c7d0470be5e147a9b (diff) | |
Merge pull request #521 from DopefishJustin/master
Add LD to the variables replaced by emmake
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | tools/shared.py | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -27,4 +27,4 @@ under the licensing terms detailed in LICENSE. * nandhp <nandhp@gmail.com> * YeZhongWen <linghuye2.0@gmail.com> * Xingxing Pan <forandom@gmail.com> - +* Justin Kerk <dopefishjustin@gmail.com> diff --git a/tools/shared.py b/tools/shared.py index a74e64b2..672a1a18 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -443,6 +443,7 @@ class Building: env['CC'] = EMCC if not WINDOWS else 'python %r' % EMCC env['CXX'] = EMXX if not WINDOWS else 'python %r' % EMXX env['AR'] = EMAR if not WINDOWS else 'python %r' % EMAR + env['LD'] = EMCC if not WINDOWS else 'python %r' % EMCC env['RANLIB'] = EMRANLIB if not WINDOWS else 'python %r' % EMRANLIB #env['LIBTOOL'] = EMLIBTOOL if not WINDOWS else 'python %r' % EMLIBTOOL env['EMMAKEN_COMPILER'] = Building.COMPILER |