aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-09-05 14:31:36 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-05 14:31:36 -0700
commitf94499ec44c928cd26454e345d7e1f5b80947f19 (patch)
treeb00233b568f8e39f83bd92f9e33d155efffba748
parenta739ea1beca193a2260f7b41f72fe0a163dd90f3 (diff)
parent85478073f70ed33a90731812a1d51859c0a048e2 (diff)
Merge pull request #1586 from waywardmonkeys/remove-emlibtool
Remove emlibtool
-rwxr-xr-xemlibtool11
-rw-r--r--emlibtool.bat2
-rw-r--r--tools/shared.py2
3 files changed, 0 insertions, 15 deletions
diff --git a/emlibtool b/emlibtool
deleted file mode 100755
index 1eb18edc..00000000
--- a/emlibtool
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python2
-
-'''
-This is a helper script. See emcc.
-'''
-
-import os, sys
-from tools import shared
-
-raise Exception('TODO: emlibtool')
-
diff --git a/emlibtool.bat b/emlibtool.bat
deleted file mode 100644
index 4ea705be..00000000
--- a/emlibtool.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\emlibtool" %* \ No newline at end of file
diff --git a/tools/shared.py b/tools/shared.py
index 22d51a12..2e11d736 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -443,7 +443,6 @@ EMCC = path_from_root('emcc')
EMXX = path_from_root('em++')
EMAR = path_from_root('emar')
EMRANLIB = path_from_root('emranlib')
-EMLIBTOOL = path_from_root('emlibtool')
EMCONFIG = path_from_root('em-config')
EMLINK = path_from_root('emlink.py')
EMMAKEN = path_from_root('tools', 'emmaken.py')
@@ -806,7 +805,6 @@ class Building:
env['LD'] = EMCC if not WINDOWS else 'python %r' % EMCC
env['LDSHARED'] = 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
env['EMSCRIPTEN_TOOLS'] = path_from_root('tools')
env['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(Building.COMPILER_TEST_OPTS)