commit f63ea7a5e00eb86ba8caa3db8bcb586abea70ac4
author Marcel Hlopko <hlopko@google.com> Mon Jan 23 12:34:38 2017 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Mon Jan 23 13:48:08 2017 +0000
tree c33a6a28be0a9b42afb07bbe1da59535d9f32c22
parent b70343f1ad52fa29541494ce11c4af35168a4f34

Expose type of library_to_link in CROSSTOOL

This cl relieves us from hard-coding -l and -l: flags in Bazel. To be able to
express the behavior in CROSSTOOL, we need to know what type of library are we
dealing with.

--
PiperOrigin-RevId: 145271426
MOS_MIGRATED_REVID=145271426

tools/cpp/CROSSTOOL.tpl

diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index c73cb42..75c9f88 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -477,14 +477,71 @@
       flag_group {
         iterate_over: 'libraries_to_link'
         flag_group {
-          expand_if_true: 'libraries_to_link.is_whole_archive'
-          iterate_over: 'libraries_to_link.names'
-          flag: '/WHOLEARCHIVE:%{libraries_to_link.names}'
+          expand_if_all_available: 'libraries_to_link.object_file_group_presence'
+          iterate_over: 'libraries_to_link.object_files'
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.no_whole_archive_presence'
+            flag: '%{libraries_to_link.object_files}'
+          }
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.whole_archive_presence'
+            flag: '/WHOLEARCHIVE:%{libraries_to_link.object_files}'
+          }
         }
         flag_group {
-          expand_if_false: 'libraries_to_link.is_whole_archive'
-          iterate_over: 'libraries_to_link.names'
-          flag: '%{libraries_to_link.names}'
+          expand_if_all_available: 'libraries_to_link.object_file_presence'
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.no_whole_archive_presence'
+            flag: '%{libraries_to_link.name}'
+          }
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.whole_archive_presence'
+            flag: '/WHOLEARCHIVE:%{libraries_to_link.name}'
+          }
+        }
+        flag_group {
+          expand_if_all_available: 'libraries_to_link.interface_library_presence'
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.no_whole_archive_presence'
+            flag: '%{libraries_to_link.name}'
+          }
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.whole_archive_presence'
+            flag: '/WHOLEARCHIVE:%{libraries_to_link.name}'
+          }
+        }
+        flag_group {
+          expand_if_all_available: 'libraries_to_link.static_library_presence'
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.no_whole_archive_presence'
+            flag: '%{libraries_to_link.name}'
+          }
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.whole_archive_presence'
+            flag: '/WHOLEARCHIVE:%{libraries_to_link.name}'
+          }
+        }
+        flag_group {
+          expand_if_all_available: 'libraries_to_link.dynamic_library_presence'
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.no_whole_archive_presence'
+            flag: '%{libraries_to_link.name}'
+          }
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.whole_archive_presence'
+            flag: '/WHOLEARCHIVE:%{libraries_to_link.name}'
+          }
+        }
+        flag_group {
+          expand_if_all_available: 'libraries_to_link.versioned_dynamic_library_presence'
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.no_whole_archive_presence'
+            flag: '%{libraries_to_link.name}'
+          }
+          flag_group {
+            expand_if_all_available: 'libraries_to_link.whole_archive_presence'
+            flag: '/WHOLEARCHIVE:%{libraries_to_link.name}'
+          }
         }
       }
     }