diff options
Diffstat (limited to 'chromium/build/config/BUILDCONFIG.gn')
| -rw-r--r-- | chromium/build/config/BUILDCONFIG.gn | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chromium/build/config/BUILDCONFIG.gn b/chromium/build/config/BUILDCONFIG.gn index 6f5d5f123f8..4cc6bfc45e6 100644 --- a/chromium/build/config/BUILDCONFIG.gn +++ b/chromium/build/config/BUILDCONFIG.gn @@ -237,7 +237,7 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" } else if (target_os == "mac") { assert(host_os == "mac", "Mac cross-compiles are unsupported.") - _default_toolchain = host_toolchain + _default_toolchain = "//build/toolchain/mac:clang_$target_cpu" } else if (target_os == "win") { # On Windows, we use the same toolchain for host and target by default. # Beware, win cross builds have some caveats, see docs/win_cross.md @@ -585,10 +585,9 @@ foreach(_target_type, # On Android, write shared library output file to metadata. We will use # this information to, for instance, collect all shared libraries that # should be packaged into an APK. - if (!defined(invoker.metadata) && is_android && (_target_type == - "shared_library" || - _target_type == - "loadable_module")) { + if (!defined(invoker.metadata) && is_android && + (_target_type == "shared_library" || + _target_type == "loadable_module")) { _output_name = _target_name if (defined(invoker.output_name)) { _output_name = invoker.output_name @@ -641,7 +640,7 @@ template("component") { assert(invoker.static_component_type == "static_library" || invoker.static_component_type == "source_set") _component_mode = invoker.static_component_type - } else if (!defined(invoker.sources)) { + } else if (!defined(invoker.sources) || invoker.sources == []) { # When there are no sources defined, use a source set to avoid creating # an empty static library (which generally don't work). _component_mode = "source_set" |