meson: use common ldflags

Author: matt-sm

foreign_cc/meson.bzl

@@ -71,7 +71,6 @@ def _create_meson_script(configureParameters):
     tools = get_tools_info(ctx)
     flags = get_flags_info(ctx)
     script = pkgconfig_script(inputs.ext_build_dirs)
-    build_options = {}
 
     # CFLAGS and CXXFLAGS are also set in foreign_cc/private/cmake_script.bzl, so that meson
     # can use the intended tools.
@@ -91,7 +90,8 @@ def _create_meson_script(configureParameters):
         script.append("##export_var## CXXFLAGS \"{} ${{CXXFLAGS:-}}\"".format(_join_flags_list(ctx.workspace_name, cxxopts).replace("\"", "'")))
 
     if flags.cxx_linker_executable:
-        script.append("##export_var## LDFLAGS \"{} ${{LDFLAGS:-}}\"".format(_join_flags_list(ctx.workspace_name, flags.cxx_linker_executable).replace("\"", "'")))
+        ldflags = _filter_flags(flags.cxx_linker_executable, ctx.attr.linkopts_exclude)
+        script.append("##export_var## LDFLAGS \"{} ${{LDFLAGS:-}}\"".format(_join_flags_list(ctx.workspace_name, ldflags).replace("\"", "'")))
 
     script.append("##export_var## CMAKE {}".format(attrs.cmake_path))
     script.append("##export_var## NINJA {}".format(attrs.ninja_path))
@@ -142,21 +142,13 @@ def _create_meson_script(configureParameters):
 
         target_args[target_name] = args
 
-    # Append custom build options
-    build_options.update(ctx.attr.options)
-    if flags.cxx_linker_shared and ctx.attr.shared_ldflags_option:
-        if ctx.attr.shared_ldflags_option in build_options:
-            fail("cannot override existing build option: {}".format(ctx.attr.shared_ldflags_option))
-
-        build_options[ctx.attr.shared_ldflags_option] = _flags_to_str_repr(ctx.workspace_name, flags.cxx_linker_shared)
-
     script.append("{meson} setup --prefix={install_dir} {setup_args} {options} {source_dir}".format(
         meson = meson_path,
         install_dir = "$$INSTALLDIR$$",
         setup_args = " ".join(target_args.get("setup", [])),
         options = " ".join([
-            "\"-D{}={}\"".format(key, build_options[key])
-            for key in build_options
+            "-D{}=\"{}\"".format(key, ctx.attr.options[key])
+            for key in ctx.attr.options
         ]),
         source_dir = "$$EXT_BUILD_ROOT$$/" + root,
     ))
@@ -225,6 +217,10 @@ def _attrs():
             doc = "__deprecated__: please use `target_args` with `'install'` target key.",
             mandatory = False,
         ),
+        "linkopts_exclude": attr.string_list(
+            doc = "Optional link options to be excluded from the common set of flags passed from the Bazel toolchain to Meson.",
+            mandatory = False,
+        ),
         "options": attr.string_dict(
             doc = "Meson `setup` options (converted to `-Dkey=value`)",
             mandatory = False,
@@ -234,10 +230,6 @@ def _attrs():
             doc = "__deprecated__: please use `target_args` with `'setup'` target key.",
             mandatory = False,
         ),
-        "shared_ldflags_option": attr.string(
-            doc = "Name of additional setup option that will contain shared ldflags.",
-            mandatory = False,
-        ),
         "target_args": attr.string_list_dict(
             doc = "Dict of arguments for each of the Meson targets. The " +
                   "target name is the key and the list of args is the value.",
@@ -314,9 +306,7 @@ def _absolutize(workspace_name, text, force = False):
 def _join_flags_list(workspace_name, flags):
     return " ".join([_absolutize(workspace_name, flag) for flag in flags])
 
-def _flags_to_str_repr(workspace_name, flags):
-    # see https://mesonbuild.com/Build-options.html#using-build-options
-    # meson array build options with elements that contain commas need to be in the format
-    # "-Doption=['a,b', 'c,d']"
-    quoted = ["'" + _absolutize(workspace_name, flag) + "'" for flag in flags]
-    return "[" + ", ".join(quoted) + "]"
+def _filter_flags(flags, exclude_list):
+    if len(exclude_list):
+        return [flag for flag in flags if flag not in exclude_list]
+    return flags