Merge branch 'master' into llvmopts

1 files changed, 2 insertions, 2 deletions

diff --git a/emar b/emar
index 312bd4a4..49d995bd 100755
--- a/emar
+++ b/emar
@@ -12,11 +12,11 @@ from tools import shared
 
 DEBUG = os.environ.get('EMCC_DEBUG')
 
-newargs = [shared.EMLD] + sys.argv[3:] + ['-o='+sys.argv[2]]
+newargs = [shared.LLVM_LINK] + sys.argv[3:] + ['-o='+sys.argv[2]]
 
 if DEBUG:
   print >> sys.stderr, 'emar:', sys.argv, '  ==>  ', newargs
 
 if len(newargs) > 2:
-  os.execvp(shared.EMLD, newargs)
+  os.execvp(shared.LLVM_LINK, newargs)