From 4e42e1767d1752d6e3fde78a6b184c2231b12ebb Mon Sep 17 00:00:00 2001 From: pcloudy Date: Mon, 9 Jul 2018 05:59:07 -0700 Subject: Windows, CROSSTOOL: Fix feature for linking interface library and dynamic library 1. Do not apply /WHOLEARCHIVE to interface library 2. On Windows, we cannot link dll directly, so remove related flag_groups RELNOTES: None PiperOrigin-RevId: 203752406 --- tools/cpp/CROSSTOOL.tpl | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'tools') diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index fa6da1e342..2460b33d39 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -678,13 +678,8 @@ toolchain { value: 'interface_library' } flag_group { - expand_if_false: 'libraries_to_link.is_whole_archive' flag: '%{libraries_to_link.name}' } - flag_group { - expand_if_true: 'libraries_to_link.is_whole_archive' - flag: '/WHOLEARCHIVE:%{libraries_to_link.name}' - } } flag_group { expand_if_equal: { @@ -700,34 +695,6 @@ toolchain { flag: '/WHOLEARCHIVE:%{libraries_to_link.name}' } } - flag_group { - expand_if_equal: { - variable: 'libraries_to_link.type' - value: 'dynamic_library' - } - flag_group { - expand_if_false: 'libraries_to_link.is_whole_archive' - flag: '%{libraries_to_link.name}' - } - flag_group { - expand_if_true: 'libraries_to_link.is_whole_archive' - flag: '/WHOLEARCHIVE:%{libraries_to_link.name}' - } - } - flag_group { - expand_if_equal: { - variable: 'libraries_to_link.type' - value: 'versioned_dynamic_library' - } - flag_group { - expand_if_false: 'libraries_to_link.is_whole_archive' - flag: '%{libraries_to_link.name}' - } - flag_group { - expand_if_true: 'libraries_to_link.is_whole_archive' - flag: '/WHOLEARCHIVE:%{libraries_to_link.name}' - } - } } } } -- cgit v1.2.3