initial prep for emcc by default

6 files changed, 39 insertions, 1 deletions

diff --git a/emconfigure b/emconfigure
new file mode 100755
index 00000000..b52d90c2
--- /dev/null
+++ b/emconfigure
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+'''
+This is a helper script. See emcc.
+'''
+
+import os, sys
+from tools import shared
+
+shared.Building.configure(sys.argv[1:])
+
diff --git a/emlibtool b/emlibtool
new file mode 100755
index 00000000..1220b93d
--- /dev/null
+++ b/emlibtool
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+'''
+This is a helper script. See emcc.
+'''
+
+import os, sys
+from tools import shared
+
+raise Exception('TODO: emlibtool')
+
diff --git a/tests/runner.py b/tests/runner.py
index c8f23237..ccca1e50 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -4870,6 +4870,10 @@ TT = %s
   del T # T is just a shape for the specific subclasses, we don't test it itself
 
   class other(RunnerCore):
+    def test_reminder(self):
+      raise Exception('''Fix emmaken.py and emconfiguren.py, they should work but mention they are deprecated
+                         Test emconfigure.''')
+
     def test_emcc(self):
       def clear():
         for name in os.listdir(self.get_dir()):
diff --git a/tools/emconfiguren.py b/tools/emconfiguren.py
index abe41564..d549908b 100755
--- a/tools/emconfiguren.py
+++ b/tools/emconfiguren.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+raise Exception('emconfiguren is deprecated!')
+
 '''
 This is a helper script for emmaken.py. See docs in that file for more info.
 '''
diff --git a/tools/emmaken.py b/tools/emmaken.py
index a509b940..89785bc5 100755
--- a/tools/emmaken.py
+++ b/tools/emmaken.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+raise Exception('emmaken is deprecated!')
+
 '''
 emmaken - the emscripten make proxy tool
 ========================================
diff --git a/tools/shared.py b/tools/shared.py
index b61552ba..1865a026 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -28,6 +28,10 @@ DEMANGLER = path_from_root('third_party', 'demangler.py')
 NAMESPACER = path_from_root('tools', 'namespacer.py')
 EMCC = path_from_root('emcc')
 EMXX = path_from_root('em++')
+EMAR = path_from_root('emar')
+EMLD = path_from_root('emld')
+EMRANLIB = path_from_root('emranlib')
+EMLIBTOOL = path_from_root('emlibtool')
 EMMAKEN = path_from_root('tools', 'emmaken.py')
 AUTODEBUGGER = path_from_root('tools', 'autodebugger.py')
 DFE = path_from_root('tools', 'dead_function_eliminator.py')
@@ -217,7 +221,11 @@ class Building:
   @staticmethod
   def get_building_env():
     env = os.environ.copy()
-    env['RANLIB'] = env['AR'] = env['CXX'] = env['CC'] = env['LIBTOOL'] = EMMAKEN
+    env['CC'] = EMCC
+    env['CXX'] = EMXX
+    env['AR'] = EMAR
+    env['RANLIB'] = EMRANLIB
+    env['LIBTOOL'] = EMLIBTOOL
     env['EMMAKEN_COMPILER'] = Building.COMPILER
     env['EMSCRIPTEN_TOOLS'] = path_from_root('tools')
     env['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(COMPILER_OPTS + Building.COMPILER_TEST_OPTS) # Normal CFLAGS is ignored by some configure's.