| Index: tools/cc_wrapper.py
|
| diff --git a/tools/cc_wrapper.py b/tools/cc_wrapper.py
|
| index b555e175f06fc422bbec33f43dc630890db74cd5..5895fcca57c83165db1976d85be88a85d4a85058 100755
|
| --- a/tools/cc_wrapper.py
|
| +++ b/tools/cc_wrapper.py
|
| @@ -21,9 +21,9 @@ def which(program):
|
|
|
| return None
|
|
|
| -def relative_to_fletch_root(*target):
|
| - fletch_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| - return os.path.join(fletch_path, *target)
|
| +def relative_to_dartino_root(*target):
|
| + dartino_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| + return os.path.join(dartino_path, *target)
|
|
|
| def invoke_clang(args):
|
| os_name = utils.GuessOS()
|
| @@ -32,7 +32,7 @@ def invoke_clang(args):
|
| args.extend([
|
| '-isysroot',
|
| subprocess.check_output(['xcrun', '--show-sdk-path']).strip()])
|
| - clang_bin = relative_to_fletch_root(
|
| + clang_bin = relative_to_dartino_root(
|
| "third_party", "clang", os_name, "bin", "clang")
|
| print clang_bin
|
| args.insert(0, clang_bin)
|
| @@ -59,11 +59,11 @@ def invoke_gcc_arm_embedded(args):
|
| # files generated by gyp on Mac.
|
| args.remove("-arch")
|
| args.remove("x86_64")
|
| - gcc_arm_embedded_bin = relative_to_fletch_root(
|
| + gcc_arm_embedded_bin = relative_to_dartino_root(
|
| "third_party", "gcc-arm-embedded", os_name, "gcc-arm-embedded", "bin",
|
| "arm-none-eabi-gcc")
|
| if not os.path.exists(gcc_arm_embedded_bin):
|
| - gcc_arm_embedded_download = relative_to_fletch_root(
|
| + gcc_arm_embedded_download = relative_to_dartino_root(
|
| "third_party", "gcc-arm-embedded", "download")
|
| print "\n*************** TOOLCHAIN ERROR ********************"
|
| print "%s not found" % gcc_arm_embedded_bin
|
| @@ -82,25 +82,25 @@ def invoke_gcc_local(args):
|
|
|
| def main():
|
| args = sys.argv[1:]
|
| - if "-L/FLETCH_ASAN" in args:
|
| - args.remove("-L/FLETCH_ASAN")
|
| + if "-L/DARTINO_ASAN" in args:
|
| + args.remove("-L/DARTINO_ASAN")
|
| args.insert(0, '-fsanitize-undefined-trap-on-error')
|
| args.insert(0, '-fsanitize=address')
|
| - if "-DFLETCH_CLANG" in args:
|
| - args.remove("-DFLETCH_CLANG")
|
| + if "-DDARTINO_CLANG" in args:
|
| + args.remove("-DDARTINO_CLANG")
|
| invoke_clang(args)
|
| - elif "-L/FLETCH_CLANG" in args:
|
| - args.remove("-L/FLETCH_CLANG")
|
| + elif "-L/DARTINO_CLANG" in args:
|
| + args.remove("-L/DARTINO_CLANG")
|
| invoke_clang(args)
|
| - elif "-DFLETCH_ARM" in args:
|
| + elif "-DDARTINO_ARM" in args:
|
| invoke_gcc_arm(args)
|
| - elif "-L/FLETCH_ARM" in args:
|
| - args.remove("-L/FLETCH_ARM")
|
| + elif "-L/DARTINO_ARM" in args:
|
| + args.remove("-L/DARTINO_ARM")
|
| invoke_gcc_arm(args)
|
| - elif "-DFLETCH_ARM64" in args:
|
| + elif "-DDARTINO_ARM64" in args:
|
| invoke_gcc_arm64(args)
|
| - elif "-L/FLETCH_ARM64" in args:
|
| - args.remove("-L/FLETCH_ARM64")
|
| + elif "-L/DARTINO_ARM64" in args:
|
| + args.remove("-L/DARTINO_ARM64")
|
| invoke_gcc_arm64(args)
|
| elif "-DGCC_XARM_EMBEDDED" in args:
|
| invoke_gcc_arm_embedded(args)
|
|
|