From 8c2bf9e63bdcc745f2ec467183c0952caf0d8228 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 27 Aug 2019 10:59:03 -0700 Subject: [PATCH 1/4] Strip bitcode from gen_snapshot --- sky/tools/create_macos_gen_snapshots.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sky/tools/create_macos_gen_snapshots.py b/sky/tools/create_macos_gen_snapshots.py index ce066c256c48a..f3daf08f4d5f9 100755 --- a/sky/tools/create_macos_gen_snapshots.py +++ b/sky/tools/create_macos_gen_snapshots.py @@ -29,9 +29,10 @@ def main(): print 'Cannot find i386 (armv7) gen_snapshot at', armv7_gen_snapshot return 1 - shutil.copy(armv7_gen_snapshot, os.path.join(args.dst, 'gen_snapshot_armv7')) - shutil.copy(arm64_gen_snapshot, os.path.join(args.dst, 'gen_snapshot_arm64')) - + subprocess.check_call(['xcrun', 'bitcode_strip', '-r', armv7_gen_snapshot, + os.path.join(args.dst, '-o', 'gen_snapshot_armv7']) + subprocess.check_call(['xcrun', 'bitcode_strip', '-r', arm64_gen_snapshot, + os.path.join(args.dst, '-o', 'gen_snapshot_arm64']) if __name__ == '__main__': sys.exit(main()) From cfd5786767b1ebd58f25561e31dbe781bb3003d3 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 27 Aug 2019 11:00:40 -0700 Subject: [PATCH 2/4] fix imports --- sky/tools/create_macos_gen_snapshots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sky/tools/create_macos_gen_snapshots.py b/sky/tools/create_macos_gen_snapshots.py index f3daf08f4d5f9..21f06a137ac9c 100755 --- a/sky/tools/create_macos_gen_snapshots.py +++ b/sky/tools/create_macos_gen_snapshots.py @@ -4,7 +4,7 @@ # found in the LICENSE file. import argparse -import shutil +import subprocess import sys import os From ef262746af131e770fdd440039c79df7c651f393 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 27 Aug 2019 11:01:50 -0700 Subject: [PATCH 3/4] ... --- sky/tools/create_macos_gen_snapshots.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sky/tools/create_macos_gen_snapshots.py b/sky/tools/create_macos_gen_snapshots.py index 21f06a137ac9c..5f05401a48c62 100755 --- a/sky/tools/create_macos_gen_snapshots.py +++ b/sky/tools/create_macos_gen_snapshots.py @@ -30,9 +30,9 @@ def main(): return 1 subprocess.check_call(['xcrun', 'bitcode_strip', '-r', armv7_gen_snapshot, - os.path.join(args.dst, '-o', 'gen_snapshot_armv7']) + '-o', os.path.join(args.dst, 'gen_snapshot_armv7']) subprocess.check_call(['xcrun', 'bitcode_strip', '-r', arm64_gen_snapshot, - os.path.join(args.dst, '-o', 'gen_snapshot_arm64']) + '-o', os.path.join(args.dst, 'gen_snapshot_arm64']) if __name__ == '__main__': sys.exit(main()) From e0a9169934582e62dce8b75fa33b5d89d3357938 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 27 Aug 2019 11:02:08 -0700 Subject: [PATCH 4/4] ... --- sky/tools/create_macos_gen_snapshots.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sky/tools/create_macos_gen_snapshots.py b/sky/tools/create_macos_gen_snapshots.py index 5f05401a48c62..1811a951d872c 100755 --- a/sky/tools/create_macos_gen_snapshots.py +++ b/sky/tools/create_macos_gen_snapshots.py @@ -30,9 +30,9 @@ def main(): return 1 subprocess.check_call(['xcrun', 'bitcode_strip', '-r', armv7_gen_snapshot, - '-o', os.path.join(args.dst, 'gen_snapshot_armv7']) + '-o', os.path.join(args.dst, 'gen_snapshot_armv7')]) subprocess.check_call(['xcrun', 'bitcode_strip', '-r', arm64_gen_snapshot, - '-o', os.path.join(args.dst, 'gen_snapshot_arm64']) + '-o', os.path.join(args.dst, 'gen_snapshot_arm64')]) if __name__ == '__main__': sys.exit(main())