From 8f5d55623e4c5842eb590876a229ef944a455f7f Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Thu, 2 Nov 2017 18:03:27 +0000 Subject: [PATCH] Revert "[GN] Adds dart_host_sdk_toolchain argument" This reverts commit 8fc90bd3bc5ac689f4aa8a02f1a65639f3f03316. Broken precomp bots due to wrong toolchain condition in dart_arch_config and dart_os_config. Change-Id: Ic5c75f9ca3a0d4f316678354da44d1fcca10499d Reviewed-on: https://dart-review.googlesource.com/18360 Reviewed-by: Zach Anderson --- BUILD.gn | 10 ---- build/compiled_action.gni | 6 +-- build/dart_host_sdk_toolchain.gni | 18 ------- runtime/BUILD.gn | 85 +++++++++++++++---------------- runtime/observatory/BUILD.gn | 7 ++- utils/compile_platform.gni | 5 +- utils/compiler/BUILD.gn | 3 +- utils/generate_patch_sdk.gni | 5 +- utils/kernel-service/BUILD.gn | 3 +- 9 files changed, 51 insertions(+), 91 deletions(-) delete mode 100644 build/dart_host_sdk_toolchain.gni diff --git a/BUILD.gn b/BUILD.gn index 3ff8e03ad7d..5ca0ff24cb5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -2,8 +2,6 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -import("build/dart_host_sdk_toolchain.gni") - # This target will be built if no target is specified when invoking ninja. group("default") { if (is_fuchsia || is_fuchsia_host) { @@ -74,14 +72,6 @@ group("create_sdk") { ] } -if (dart_host_sdk_toolchain != host_toolchain) { - group("create_host_sdk") { - deps = [ - "sdk:create_sdk($dart_host_sdk_toolchain)", - ] - } -} - group("dart2js") { deps = [ "utils/compiler:dart2js", diff --git a/build/compiled_action.gni b/build/compiled_action.gni index e332763732e..3951275e5ec 100644 --- a/build/compiled_action.gni +++ b/build/compiled_action.gni @@ -66,8 +66,6 @@ # saves unnecessarily compiling your tool for the target platform. But if you # need a target build of your tool as well, just leave off the if statement. -import("dart_host_sdk_toolchain.gni") - if (host_os == "win") { _host_executable_suffix = ".exe" } else { @@ -99,7 +97,7 @@ template("compiled_action") { outputs = invoker.outputs # Constuct the host toolchain version of the tool. - host_tool = invoker.tool + "($dart_host_toolchain)" + host_tool = invoker.tool + "($host_toolchain)" # Get the path to the executable. Currently, this assumes that the tool # does not specify output_name so that the target name is the name to use. @@ -152,7 +150,7 @@ template("compiled_action_foreach") { outputs = invoker.outputs # Constuct the host toolchain version of the tool. - host_tool = invoker.tool + "($dart_host_toolchain)" + host_tool = invoker.tool + "($host_toolchain)" # Get the path to the executable. Currently, this assumes that the tool # does not specify output_name so that the target name is the name to use. diff --git a/build/dart_host_sdk_toolchain.gni b/build/dart_host_sdk_toolchain.gni deleted file mode 100644 index 95005db5eaf..00000000000 --- a/build/dart_host_sdk_toolchain.gni +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file -# for details. All rights reserved. Use of this source code is governed by a -# BSD-style license that can be found in the LICENSE file. - -declare_args() { - # In a cross-build, this should be set to the toolchain to use to build a Dart - # SDK to run on the host that targets the host. This is distinct from - # 'host_toolchain', which in a cross-build builds artifacts to run on the host - # that target the target architecture. - dart_host_sdk_toolchain = host_toolchain -} - -# dart_host_toolchain should be used in the Dart tree instead of host_toolchain. -# It will ensure that we are selecting the correct host toolchain. -dart_host_toolchain = host_toolchain -if (current_toolchain == dart_host_sdk_toolchain) { - dart_host_toolchain = dart_host_sdk_toolchain -} diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index fdb2779eede..16f41373e6f 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -2,7 +2,6 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -import("../build/dart_host_sdk_toolchain.gni") import("runtime_args.gni") config("dart_public_config") { @@ -56,52 +55,48 @@ config("dart_no_snapshot_config") { config("dart_os_config") { defines = [] - if (current_toolchain != dart_host_sdk_toolchain) { - if (target_os == "android") { - defines += [ "TARGET_OS_ANDROID" ] - } else if (target_os == "fuchsia") { - defines += [ "TARGET_OS_FUCHSIA" ] - } else if (target_os == "ios") { - defines += [ "TARGET_OS_MACOS" ] - defines += [ "TARGET_OS_MACOS_IOS" ] - } else if (target_os == "linux") { - defines += [ "TARGET_OS_LINUX" ] - } else if (target_os == "mac") { - defines += [ "TARGET_OS_MACOS" ] - } else if (target_os == "win") { - defines += [ "TARGET_OS_WINDOWS" ] - } else { - print("Unknown target_os: $target_os") - assert(false) - } + if (target_os == "android") { + defines += [ "TARGET_OS_ANDROID" ] + } else if (target_os == "fuchsia") { + defines += [ "TARGET_OS_FUCHSIA" ] + } else if (target_os == "ios") { + defines += [ "TARGET_OS_MACOS" ] + defines += [ "TARGET_OS_MACOS_IOS" ] + } else if (target_os == "linux") { + defines += [ "TARGET_OS_LINUX" ] + } else if (target_os == "mac") { + defines += [ "TARGET_OS_MACOS" ] + } else if (target_os == "win") { + defines += [ "TARGET_OS_WINDOWS" ] + } else { + print("Unknown target_os: $target_os") + assert(false) } } config("dart_arch_config") { defines = [] - if (current_toolchain != dart_host_sdk_toolchain) { - if (dart_target_arch == "arm") { - defines += [ "TARGET_ARCH_ARM" ] - } else if (dart_target_arch == "armv6") { - defines += [ "TARGET_ARCH_ARM" ] - defines += [ "TARGET_ARCH_ARM_6" ] - } else if (dart_target_arch == "armv5te") { - defines += [ "TARGET_ARCH_ARM" ] - defines += [ "TARGET_ARCH_ARM_5TE" ] - } else if (dart_target_arch == "arm64") { - defines += [ "TARGET_ARCH_ARM64" ] - } else if (dart_target_arch == "x64") { - defines += [ "TARGET_ARCH_X64" ] - } else if (dart_target_arch == "ia32" || dart_target_arch == "x86") { - defines += [ "TARGET_ARCH_IA32" ] - } else if (dart_target_arch == "dbc") { - defines += [ "TARGET_ARCH_DBC" ] - defines += [ "USING_SIMULATOR" ] - } else { - print("Invalid dart_target_arch: $dart_target_arch") - assert(false) - } + if (dart_target_arch == "arm") { + defines += [ "TARGET_ARCH_ARM" ] + } else if (dart_target_arch == "armv6") { + defines += [ "TARGET_ARCH_ARM" ] + defines += [ "TARGET_ARCH_ARM_6" ] + } else if (dart_target_arch == "armv5te") { + defines += [ "TARGET_ARCH_ARM" ] + defines += [ "TARGET_ARCH_ARM_5TE" ] + } else if (dart_target_arch == "arm64") { + defines += [ "TARGET_ARCH_ARM64" ] + } else if (dart_target_arch == "x64") { + defines += [ "TARGET_ARCH_X64" ] + } else if (dart_target_arch == "ia32" || dart_target_arch == "x86") { + defines += [ "TARGET_ARCH_IA32" ] + } else if (dart_target_arch == "dbc") { + defines += [ "TARGET_ARCH_DBC" ] + defines += [ "USING_SIMULATOR" ] + } else { + print("Invalid dart_target_arch: $dart_target_arch") + assert(false) } } @@ -184,10 +179,10 @@ template("libdart_library") { } static_library(target_name) { configs += [ - ":dart_arch_config", - ":dart_config", - ":dart_os_config", - ] + extra_configs + ":dart_arch_config", + ":dart_config", + ":dart_os_config", + ] + extra_configs if (is_fuchsia) { configs -= [ "//build/config:symbol_visibility_hidden" ] } diff --git a/runtime/observatory/BUILD.gn b/runtime/observatory/BUILD.gn index 94f0ce0c87f..33573d56afd 100644 --- a/runtime/observatory/BUILD.gn +++ b/runtime/observatory/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../../build/dart_host_sdk_toolchain.gni") import("../../build/executable_suffix.gni") import("../../build/prebuilt_dart_sdk.gni") import("observatory_sources.gni") @@ -11,10 +10,10 @@ import("observatory_sources.gni") pub_build_deps = [] pub_build_args = [] if (!prebuilt_dart_exe_works) { - pub_build_deps += [ "../bin:dart_bootstrap($dart_host_toolchain)" ] + pub_build_deps += [ "../bin:dart_bootstrap($host_toolchain)" ] - dart_out_dir = get_label_info("../bin:dart_bootstrap($dart_host_toolchain)", - "root_out_dir") + dart_out_dir = + get_label_info("../bin:dart_bootstrap($host_toolchain)", "root_out_dir") dart_bootstrap = rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix") pub_build_args = [ diff --git a/utils/compile_platform.gni b/utils/compile_platform.gni index 89169ebf7d4..e539da55c6b 100644 --- a/utils/compile_platform.gni +++ b/utils/compile_platform.gni @@ -2,7 +2,6 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -import("../build/dart_host_sdk_toolchain.gni") import("../build/prebuilt_dart_sdk.gni") _dart_root = get_path_info("..", "abspath") @@ -36,9 +35,9 @@ template("compile_platform") { depfile = outputs[0] + ".d" if (!prebuilt_dart_exe_works) { - deps += [ "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)" ] + deps += [ "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)" ] dart_out_dir = get_label_info( - "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)", + "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)", "root_out_dir") args += [ "--dart-executable", diff --git a/utils/compiler/BUILD.gn b/utils/compiler/BUILD.gn index 2f442548b13..00f992150f3 100644 --- a/utils/compiler/BUILD.gn +++ b/utils/compiler/BUILD.gn @@ -3,7 +3,6 @@ # BSD-style license that can be found in the LICENSE file. import("../../build/compiled_action.gni") -import("../../build/dart_host_sdk_toolchain.gni") import("../../build/prebuilt_dart_sdk.gni") import("../../utils/compile_platform.gni") import("../../utils/generate_patch_sdk.gni") @@ -85,7 +84,7 @@ generate_patched_sdk("patched_dart2js_sdk") { deps = [ # TODO(ahe): This is needed by ../../tools/patch_sdk.dart to compute # dependencies. - "../../runtime/vm:kernel_platform_files($dart_host_toolchain)", + "../../runtime/vm:kernel_platform_files($host_toolchain)", ] input_patches_dir = "../../sdk/lib/_internal/js_runtime/lib" patched_sdk_dir = "patched_dart2js_sdk" diff --git a/utils/generate_patch_sdk.gni b/utils/generate_patch_sdk.gni index 95fdc46fb5d..f704b2407cd 100644 --- a/utils/generate_patch_sdk.gni +++ b/utils/generate_patch_sdk.gni @@ -2,7 +2,6 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -import("../build/dart_host_sdk_toolchain.gni") import("../build/prebuilt_dart_sdk.gni") _dart_root = get_path_info("..", "abspath") @@ -29,7 +28,7 @@ template("generate_patched_sdk") { } if (!prebuilt_dart_exe_works) { - deps += [ "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)" ] + deps += [ "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)" ] } script = "$_dart_root/tools/patch_sdk.py" @@ -56,7 +55,7 @@ template("generate_patched_sdk") { args = [ "--quiet" ] if (!prebuilt_dart_exe_works) { dart_out_dir = get_label_info( - "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)", + "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)", "root_out_dir") dart_bootstrap = rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix") diff --git a/utils/kernel-service/BUILD.gn b/utils/kernel-service/BUILD.gn index 02e55ca29b2..e84716914fb 100644 --- a/utils/kernel-service/BUILD.gn +++ b/utils/kernel-service/BUILD.gn @@ -2,13 +2,12 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -import("../../build/dart_host_sdk_toolchain.gni") import("../application_snapshot.gni") application_snapshot("kernel-service") { dfe_script = "kernel-service.dart" deps = [ - "../../runtime/vm:kernel_platform_files($dart_host_toolchain)", + "../../runtime/vm:kernel_platform_files($host_toolchain)", ] main_dart = dfe_script training_args = [