Move compiler paths out of top level of shared.py. NFC

This is a step towards separating the import of python modules from the
initialization of the compiler.  The goal here is to remove top level
code (i.e. Remove side effects from importing).

Author: sbc100

emar.py

@@ -11,4 +11,4 @@
 
 from tools import shared
 
-shared.exec_process([shared.LLVM_AR] + sys.argv[1:])
+shared.exec_process([shared.paths.LLVM_AR] + sys.argv[1:])

emcc.py

@@ -43,7 +43,7 @@
 from tools.cmdline import CLANG_FLAGS_WITH_ARGS, options
 from tools.response_file import substitute_response_files
 from tools.settings import COMPILE_TIME_SETTINGS, default_setting, settings, user_settings
-from tools.shared import DEBUG, DYLIB_EXTENSIONS, in_temp
+from tools.shared import DEBUG, DYLIB_EXTENSIONS, in_temp, paths
 from tools.toolchain_profiler import ToolchainProfiler
 from tools.utils import exit_with_error, get_file_suffix, read_file, unsuffixed_basename
 
@@ -168,9 +168,9 @@ def make_relative(filename):
 @ToolchainProfiler.profile()
 def main(args):
   if shared.run_via_emxx:
-    clang = shared.CLANG_CXX
+    clang = paths.CLANG_CXX
   else:
-    clang = shared.CLANG_CC
+    clang = paths.CLANG_CC
 
   # Special case the handling of `-v` because it has a special/different meaning
   # when used with no other arguments.  In particular, we must handle this early
@@ -477,9 +477,9 @@ def phase_setup(state):
 @ToolchainProfiler.profile_block('compile inputs')
 def phase_compile_inputs(options, state, newargs):
   if shared.run_via_emxx:
-    compiler = [shared.CLANG_CXX]
+    compiler = [paths.CLANG_CXX]
   else:
-    compiler = [shared.CLANG_CC]
+    compiler = [paths.CLANG_CC]
 
   if config.COMPILER_WRAPPER:
     logger.debug('using compiler wrapper: %s', config.COMPILER_WRAPPER)

emranlib.py

@@ -14,4 +14,4 @@
 
 from tools import shared
 
-shared.exec_process([shared.LLVM_RANLIB] + sys.argv[1:])
+shared.exec_process([shared.paths.LLVM_RANLIB] + sys.argv[1:])

emscan-deps.py

@@ -21,4 +21,4 @@
 # Add any clang flags that emcc would add.
 newargs += compile.get_cflags(tuple(argv))
 
-shared.exec_process([shared.CLANG_SCAN_DEPS] + newargs)
+shared.exec_process([shared.paths.CLANG_SCAN_DEPS] + newargs)

emstrip.py

@@ -11,4 +11,4 @@
 
 from tools import shared
 
-shared.exec_process([shared.LLVM_STRIP] + sys.argv[1:])
+shared.exec_process([shared.paths.LLVM_STRIP] + sys.argv[1:])

test/browser_common.py

@@ -36,7 +36,7 @@
 
 from tools import feature_matrix, shared, utils
 from tools.feature_matrix import UNSUPPORTED
-from tools.shared import DEBUG, EMCC, exit_with_error
+from tools.shared import DEBUG, exit_with_error, paths
 from tools.utils import MACOS, WINDOWS, memoize, path_from_root, read_binary
 
 logger = logging.getLogger('common')
@@ -878,7 +878,7 @@ def compile_btest(self, filename, cflags, reporting=Reporting.FULL):
       if reporting == Reporting.FULL:
         # If C reporting (i.e. the REPORT_RESULT macro) is required we
         # also include report_result.c and force-include report_result.h
-        self.run_process([EMCC, '-c', '-I' + TEST_ROOT,
+        self.run_process([paths.EMCC, '-c', '-I' + TEST_ROOT,
                           test_file('report_result.c')] + self.get_cflags(compile_only=True) + (['-fPIC'] if '-fPIC' in cflags else []))
         cflags += ['report_result.o', '-include', test_file('report_result.h')]
     if EMTEST_BROWSER == 'node':

test/clang_native.py

@@ -8,7 +8,7 @@
 import platform
 import sys
 
-from tools.shared import CLANG_CC, CLANG_CXX, PIPE
+from tools.shared import PIPE, paths
 from tools.utils import MACOS, WINDOWS, path_from_root, run_process
 
 logger = logging.getLogger('clang_native')
@@ -63,9 +63,9 @@ def get_clang_native_env():
     return CACHED_CLANG_NATIVE_ENV
   env = os.environ.copy()
 
-  env['CC'] = CLANG_CC
-  env['CXX'] = CLANG_CXX
-  env['LD'] = CLANG_CXX
+  env['CC'] = paths.CLANG_CC
+  env['CXX'] = paths.CLANG_CXX
+  env['LD'] = paths.CLANG_CXX
 
   if MACOS:
     path = run_process(['xcrun', '--show-sdk-path'], stdout=PIPE).stdout.strip()

test/common.py

@@ -32,7 +32,7 @@
 from tools import building, config, feature_matrix, shared, utils
 from tools.feature_matrix import Feature
 from tools.settings import COMPILE_TIME_SETTINGS
-from tools.shared import DEBUG, EMCC, EMXX, get_canonical_temp_dir
+from tools.shared import DEBUG, get_canonical_temp_dir, paths
 from tools.utils import (
   WINDOWS,
   exit_with_error,
@@ -130,9 +130,9 @@ def copytree(src, dest):
 
 def compiler_for(filename, force_c=False):
   if utils.suffix(filename) in ('.cc', '.cxx', '.cpp') and not force_c:
-    return EMXX
+    return paths.EMXX
   else:
-    return EMCC
+    return paths.EMCC
 
 
 def record_flaky_test(test_name, attempt_count, max_attempts, exception_msg):
@@ -1272,7 +1272,7 @@ def _test_dylink_dso_needed(self, do_run):
       ''')
 
     def ccshared(src, linkto=None):
-      cmdv = [EMCC, src, '-o', utils.unsuffixed(src) + '.wasm', '-sSIDE_MODULE'] + self.get_cflags()
+      cmdv = [paths.EMCC, src, '-o', utils.unsuffixed(src) + '.wasm', '-sSIDE_MODULE'] + self.get_cflags()
       if linkto:
         cmdv += linkto
       self.run_process(cmdv)

test/runner.py

@@ -630,8 +630,8 @@ def find_llvm_git_root(dir):
     print(f'LLVM git directory: "{llvm_git_root}"')
     print_repository_info(llvm_git_root, 'LLVM')
 
-  clang_version = utils.run_process([shared.CLANG_CC, '--version'], stdout=subprocess.PIPE).stdout.strip()
-  print(f'Clang: "{shared.CLANG_CC}"\n{clang_version}\n')
+  clang_version = utils.run_process([shared.paths.CLANG_CC, '--version'], stdout=subprocess.PIPE).stdout.strip()
+  print(f'Clang: "{shared.paths.CLANG_CC}"\n{clang_version}\n')
 
   print(f'EMTEST_BROWSER: {browser_common.EMTEST_BROWSER}')
   if browser_common.is_firefox():

test/test_benchmark.py

@@ -25,7 +25,7 @@
 from decorators import needs_make
 
 from tools import building, utils
-from tools.shared import CLANG_CC, CLANG_CXX, EMCC, PIPE, config
+from tools.shared import PIPE, config, paths
 from tools.utils import run_process
 
 # standard arguments for timing:
@@ -232,7 +232,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat
     final = final.replace('.cpp', '')
     utils.delete_file(final)
     cmd = [
-      EMCC, filename,
+      paths.EMCC, filename,
       OPTIMIZATIONS,
       '-sINITIAL_MEMORY=256MB',
       '-sENVIRONMENT=node,shell',
@@ -361,7 +361,7 @@ def get_output_files(self):
 aot_v8 = (config.V8_ENGINE if config.V8_ENGINE else []) + ['--no-liftoff']
 
 named_benchmarkers = {
-  'clang': NativeBenchmarker('clang', [CLANG_CC], [CLANG_CXX]),
+  'clang': NativeBenchmarker('clang', [paths.CLANG_CC], [paths.CLANG_CXX]),
   'gcc': NativeBenchmarker('gcc',   ['gcc', '-no-pie'],  ['g++', '-no-pie']),
   'size': SizeBenchmarker('size'),
   'v8': EmscriptenBenchmarker('v8', aot_v8),