diff --git a/build/builder/commands/build.py b/build/builder/commands/build.py index 6790715dd635b79f6185e4b6cc6623e76a2153df..9ff37a359103c9ba1f47730b43cf69726b96180d 100755 --- a/build/builder/commands/build.py +++ b/build/builder/commands/build.py @@ -24,10 +24,12 @@ class Builder: self.args = args self.project_dir = args.project_dir - os_name = "linux" - arch = "x64" - if args.target_cpu == "auto": - arch, os_name = get_machine_info() + arch, os_name = get_machine_info() + if args.target_cpu != "auto": + if arch != args.target_cpu: + exit("current mechine is not " + args.target_cpu + " don't use -t " + args.target_cpu) + if os_name != "linux": + exit("this build system is only support linux") self.build_output_dir = os.path.join(args.project_dir, "out", args.build_type.title(), arch) self._build_tools_dir = os.path.join(args.project_dir, "prebuilts", "build-tools", os_name+"-"+arch, "bin") self.gn_path = os.path.join(self._build_tools_dir, "gn") diff --git a/build/builder/common/prebuild.py b/build/builder/common/prebuild.py index 92db12499b0ae7c7d32b74195c6eb2cae7dbc21b..9fb9ac76c944970424f28d28a8c4b6f965826194 100755 --- a/build/builder/common/prebuild.py +++ b/build/builder/common/prebuild.py @@ -16,9 +16,9 @@ def get_machine_info(): def build_deps(output_dir): arch, os_name = get_machine_info() copy_path = "prebuilts/build-tools/" + os_name + "-" + arch + "/bin/" - abs_copy_path = os.path.join(output_dir, "../../", copy_path) - ninja_path = os.path.abspath(os.path.join(abs_copy_path, "ninja")) - gn_path = os.path.abspath(os.path.join(abs_copy_path, "gn")) + abs_copy_path = os.path.abspath(os.path.join(output_dir, "../../", copy_path)) + ninja_path = os.path.join(abs_copy_path, "ninja") + gn_path = os.path.join(abs_copy_path, "gn") if os.path.exists(ninja_path) and os.path.exists(gn_path): return @@ -54,7 +54,7 @@ def build_deps(output_dir): os.makedirs(os.path.join(gn_dir, 'out')) exec_sys_command(['cp', 'last_commit_position.h', 'out/']) exec_sys_command(['python3', 'build/gen.py', '--no-last-commit-position', '--no-static-libstdc++']) - exec_sys_command([os.path.join(ninja_dir, "ninja-1.10.2", "ninja"), '-C', 'out']) + exec_sys_command([os.path.join(ninja_dir, "ninja-1.10.2", "ninja"), 'gn', '-C', 'out']) os.chdir(os.path.join(gn_dir, "out")) if os.path.exists("gn"): exec_sys_command(['cp', 'gn', gn_path])