From 6fde78cb2f10a386b8adedcc4c5fe7f697e4987c Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Wed, 23 Jan 2019 10:40:29 -0800 Subject: [PATCH] Prevent mac_framework_bundle configs from getting reset If the invoker sets "configs", the default configs would be overridden by the forward_variables_from() call. This fixes linker errors for certain shared libraries on Mac Asan when rolling in the change that switches Mac to build with our in-tree libc++. BUG=chromium:924121 R=yvesg CC=thakis Change-Id: If9db41b724f891034086c64dc7ba38a6406aef92 Reviewed-on: https://webrtc-review.googlesource.com/c/119286 Reviewed-by: Mirko Bonadei Reviewed-by: Yves Gerey Commit-Queue: Tom Anderson Cr-Commit-Position: refs/heads/master@{#26377} --- webrtc.gni | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni index 65975210b0..582071e1e2 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -717,7 +717,10 @@ if (is_mac) { modulemap_path = "$target_gen_dir/Modules/module.modulemap" mac_framework_bundle(target_name) { - forward_variables_from(invoker, "*", []) + forward_variables_from(invoker, "*", [ "configs" ]) + if (defined(invoker.configs)) { + configs += invoker.configs + } framework_version = "A" framework_contents = [