diff options
| author |  hlopko <hlopko@google.com> | 2018-03-01 13:17:23 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-01 13:19:47 -0800 |
| commit | dad2276e54f504b4e9ee0107e845b838d0a9b956 (patch) | |
| tree | 997caeaede0460026d2b3279133197cd3f157928 /src | |
| parent | 4b6c0ec4b54e258763ce22e1a7f529d293aff026 (diff) | |
Introduce a specific action_config for linking nodeps dynamic libraries
With this cl toolchain author can specify different flags for linking shared
library produced by cc_library and a shared library produced by cc_binary.
This is what is needed to remove linking_mode_flags - MOSTLY_STATIC_LIBRARIES
from the crosstool. What this linking mode was used for was to separate when we
link transitive shared library from cc_binary and when we link this
little-and-not-really-useful-outside-of-bazel nodeps shared library in cc_library.
RELNOTES: CcToolchain: Introduced action_config for "c++-link-transitive-dynamic-library"
PiperOrigin-RevId: 187523334
Diffstat (limited to 'src')
13 files changed, 681 insertions, 31 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index ac9abc2321..b69bd74300 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -125,6 +125,7 @@ public final class CcCommon { // differently named outputs. Link.LinkTargetType.PIC_STATIC_LIBRARY.getActionName(), Link.LinkTargetType.INTERFACE_DYNAMIC_LIBRARY.getActionName(), + Link.LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName(), Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(), Link.LinkTargetType.ALWAYS_LINK_STATIC_LIBRARY.getActionName(), Link.LinkTargetType.ALWAYS_LINK_PIC_STATIC_LIBRARY.getActionName(), diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java index 644feb2558..3463012abd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java @@ -211,8 +211,8 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { if (!createDynamicLibrary && !supportsDynamicLinker) { ImmutableList.Builder<Artifact> dynamicLibraries = ImmutableList.builder(); dynamicLibraries.add( - CppHelper.getLinuxLinkedArtifact( - ruleContext, ruleContext.getConfiguration(), LinkTargetType.DYNAMIC_LIBRARY)); + CppHelper.getLinuxLinkedArtifact( + ruleContext, ruleContext.getConfiguration(), LinkTargetType.NODEPS_DYNAMIC_LIBRARY)); if (CppHelper.useInterfaceSharedObjects(ccToolchain.getCppConfiguration(), ccToolchain)) { dynamicLibraries.add( CppHelper.getLinuxLinkedArtifact( @@ -229,8 +229,8 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { // a "no generating action for this artifact" error. ImmutableList.Builder<Artifact> dynamicLibraries = ImmutableList.builder(); dynamicLibraries.add( - CppHelper.getLinuxLinkedArtifact( - ruleContext, ruleContext.getConfiguration(), LinkTargetType.DYNAMIC_LIBRARY)); + CppHelper.getLinuxLinkedArtifact( + ruleContext, ruleContext.getConfiguration(), LinkTargetType.NODEPS_DYNAMIC_LIBRARY)); if (CppHelper.useInterfaceSharedObjects(ccToolchain.getCppConfiguration(), ccToolchain)) { dynamicLibraries.add( CppHelper.getLinuxLinkedArtifact( diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java index 24a8c5c69f..c9356c80f8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java @@ -587,7 +587,7 @@ public final class CcLinkingHelper { CppHelper.getLinuxLinkedArtifact( ruleContext, configuration, - Link.LinkTargetType.DYNAMIC_LIBRARY, + Link.LinkTargetType.NODEPS_DYNAMIC_LIBRARY, linkedArtifactNameSuffix)); if (CppHelper.useInterfaceSharedObjects(ccToolchain.getCppConfiguration(), ccToolchain) @@ -819,7 +819,7 @@ public final class CcLinkingHelper { if (dynamicLibrary == null) { // If the crosstool is configured to select an output artifact, we use that selection. // Otherwise, we use linux defaults. - soImpl = getLinkedArtifact(LinkTargetType.DYNAMIC_LIBRARY); + soImpl = getLinkedArtifact(LinkTargetType.NODEPS_DYNAMIC_LIBRARY); mainLibraryIdentifier = libraryIdentifier; } else { // This branch is only used for vestigial Google-internal rules where the name of the output @@ -857,7 +857,7 @@ public final class CcLinkingHelper { .addObjectFiles(ccOutputs.getObjectFiles(usePicForSharedLibs)) .addNonCodeInputs(ccOutputs.getHeaderTokenFiles()) .addLtoBitcodeFiles(ccOutputs.getLtoBitcodeFiles()) - .setLinkType(LinkTargetType.DYNAMIC_LIBRARY) + .setLinkType(LinkTargetType.NODEPS_DYNAMIC_LIBRARY) .setLinkStaticness(LinkStaticness.DYNAMIC) .addActionInputs(linkActionInputs) .setLibraryIdentifier(mainLibraryIdentifier) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java index 0ed940b78b..dd39fe24c3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java @@ -49,6 +49,7 @@ public class CppActionConfigs { + " name: 'dynamic_library_linker_tool'" + " flag_set {" + " action: 'c++-link-dynamic-library'" + + " action: 'c++-link-nodeps-dynamic-library'" + " flag_group {" + " flag: '" + cppLinkDynamicLibraryToolPath @@ -370,6 +371,7 @@ public class CppActionConfigs { " action: 'c++-compile'", " action: 'c++-link-interface-dynamic-library'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'c++-link-executable'", " flag_group {", " flag: '-fprofile-generate=%{fdo_instrument_path}'", @@ -444,6 +446,29 @@ public class CppActionConfigs { " implies: 'sysroot'", "}", "action_config {", + " config_name: 'c++-link-nodeps-dynamic-library'", + " action_name: 'c++-link-nodeps-dynamic-library'", + " tool {", + " tool_path: '" + gccToolPath + "'", + " }", + ifTrue( + supportsInterfaceSharedLibraries, + "implies: 'build_interface_libraries'", + "implies: 'dynamic_library_linker_tool'"), + " implies: 'symbol_counts'", + " implies: 'strip_debug_symbols'", + " implies: 'shared_flag'", + " implies: 'linkstamps'", + " implies: 'output_execpath_flags'", + " implies: 'runtime_library_search_directories'", + " implies: 'library_search_directories'", + " implies: 'libraries_to_link'", + " implies: 'legacy_link_flags'", + " implies: 'linker_param_file'", + " implies: 'fission_support'", + " implies: 'sysroot'", + "}", + "action_config {", " config_name: 'c++-link-dynamic-library'", " action_name: 'c++-link-dynamic-library'", " tool {", @@ -509,6 +534,7 @@ public class CppActionConfigs { " flag_set {", " expand_if_all_available: 'generate_interface_library'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " flag: '%{generate_interface_library}'", " flag: '%{interface_library_builder_path}'", @@ -528,6 +554,7 @@ public class CppActionConfigs { " expand_if_all_available: 'symbol_counts_output'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " flag: '-Wl,--print-symbol-counts=%{symbol_counts_output}'", " }", @@ -539,6 +566,7 @@ public class CppActionConfigs { " name: 'shared_flag'", " flag_set {", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " flag: '-shared'", " }", @@ -551,6 +579,7 @@ public class CppActionConfigs { " flag_set {", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " expand_if_all_available: 'linkstamp_paths'", " flag_group {", " iterate_over: 'linkstamp_paths'", @@ -565,6 +594,7 @@ public class CppActionConfigs { " flag_set {", " expand_if_all_available: 'output_execpath'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'c++-link-executable'", " flag_group {", " flag: '-o'", @@ -580,6 +610,7 @@ public class CppActionConfigs { " expand_if_all_available: 'runtime_library_search_directories'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " iterate_over: 'runtime_library_search_directories'", " flag_group {", @@ -611,6 +642,7 @@ public class CppActionConfigs { " expand_if_all_available: 'library_search_directories'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " iterate_over: 'library_search_directories'", " flag: '-L%{library_search_directories}'", @@ -671,6 +703,7 @@ public class CppActionConfigs { " expand_if_all_available: 'libraries_to_link'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " iterate_over: 'libraries_to_link'", " flag_group {", @@ -840,6 +873,7 @@ public class CppActionConfigs { " expand_if_all_available: 'legacy_link_flags'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " iterate_over: 'legacy_link_flags'", " flag: '%{legacy_link_flags}'", @@ -853,6 +887,7 @@ public class CppActionConfigs { " flag_set {", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'c++-link-interface-dynamic-library'", " flag_group {", " expand_if_all_available: 'is_using_fission'", @@ -867,6 +902,7 @@ public class CppActionConfigs { " flag_set {", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'c++-link-interface-dynamic-library'", " flag_group {", " expand_if_all_available: 'strip_debug_symbols'", @@ -897,6 +933,7 @@ public class CppActionConfigs { " flag_set {", " action: 'c++-link-interface-dynamic-library'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'c++-link-executable'", " action: 'objc-executable'", " action: 'objc++-executable'", @@ -929,6 +966,7 @@ public class CppActionConfigs { " flag_set {", " action: 'c++-link-interface-dynamic-library'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'c++-link-executable'", " flag_group {", " flag: '-lgcov'", @@ -1026,6 +1064,7 @@ public class CppActionConfigs { " action: 'c++-module-compile'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " action: 'clif-match'", " action: 'lto-backend'", " flag_group {", @@ -1070,6 +1109,7 @@ public class CppActionConfigs { " expand_if_all_available: 'linker_param_file'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " flag: '-Wl,@%{linker_param_file}'", " }", diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index 6a0ce57f52..79edac28a8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -715,6 +715,7 @@ public class CppLinkActionBuilder { // That was probably an unintended side effect of the change that introduced interface // outputs. // On Windows, We can always split the command line when building DLL. + case NODEPS_DYNAMIC_LIBRARY: case DYNAMIC_LIBRARY: return (interfaceOutput == null || featureConfiguration.isEnabled(CppRuleClasses.TARGETS_WINDOWS)); @@ -801,7 +802,7 @@ public class CppLinkActionBuilder { final ImmutableMap<Linkstamp, Artifact> linkstampMap = mapLinkstampsToOutputs(linkstamps, ruleContext, configuration, output, linkArtifactFactory); - if (interfaceOutput != null && (fake || linkType != LinkTargetType.DYNAMIC_LIBRARY)) { + if (interfaceOutput != null && (fake || !linkType.isDynamicLibrary())) { throw new RuntimeException( "Interface output can only be used " + "with non-fake DYNAMIC_LIBRARY targets"); } @@ -1022,7 +1023,7 @@ public class CppLinkActionBuilder { Preconditions.checkArgument( linkType != LinkTargetType.INTERFACE_DYNAMIC_LIBRARY, "you can't link an interface dynamic library directly"); - if (linkType != LinkTargetType.DYNAMIC_LIBRARY) { + if (!linkType.isDynamicLibrary()) { Preconditions.checkArgument( interfaceOutput == null, "interface output may only be non-null for dynamic library links"); @@ -1219,7 +1220,7 @@ public class CppLinkActionBuilder { CppHelper.getFdoBuildStamp(ruleContext, fdoSupport.getFdoSupport()), featureConfiguration, cppConfiguration.forcePic() - || (linkType == LinkTargetType.DYNAMIC_LIBRARY + || (linkType.isDynamicLibrary() && toolchain.toolchainNeedsPic()), Matcher.quoteReplacement( isNativeDeps && cppConfiguration.shareNativeDeps() @@ -1260,7 +1261,7 @@ public class CppLinkActionBuilder { } private boolean shouldUseLinkDynamicLibraryTool() { - return linkType.equals(LinkTargetType.DYNAMIC_LIBRARY) + return linkType.isDynamicLibrary() && toolchain.supportsInterfaceSharedObjects() && !featureConfiguration.hasConfiguredLinkerPathInActionConfig(); } @@ -1275,9 +1276,7 @@ public class CppLinkActionBuilder { boolean fullyStatic = (staticness == LinkStaticness.FULLY_STATIC); boolean mostlyStatic = (staticness == LinkStaticness.MOSTLY_STATIC); boolean sharedLinkopts = - type == LinkTargetType.DYNAMIC_LIBRARY - || linkopts.contains("-shared") - || cppConfig.hasSharedLinkOption(); + type.isDynamicLibrary() || linkopts.contains("-shared") || cppConfig.hasSharedLinkOption(); return (isNativeDeps || cppConfig.legacyWholeArchive()) && (fullyStatic || mostlyStatic) && sharedLinkopts; @@ -1393,10 +1392,10 @@ public class CppLinkActionBuilder { } return this; } - + /** * Sets the interface output of the link. A non-null argument can only be provided if the link - * type is {@code DYNAMIC_LIBRARY} and fake is false. + * type is {@code NODEPS_DYNAMIC_LIBRARY} and fake is false. */ public CppLinkActionBuilder setInterfaceOutput(Artifact interfaceOutput) { this.interfaceOutput = interfaceOutput; @@ -1906,7 +1905,7 @@ public class CppLinkActionBuilder { String runtimeSolibName = runtimeSolibDir != null ? runtimeSolibDir.getBaseName() : null; boolean runtimeRpath = runtimeSolibDir != null - && (linkType == LinkTargetType.DYNAMIC_LIBRARY + && (linkType.isDynamicLibrary() || (linkType == LinkTargetType.EXECUTABLE && linkStaticness == LinkStaticness.DYNAMIC)); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java index d159b7db13..852e28e8b5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java @@ -166,12 +166,20 @@ public abstract class Link { ArtifactCategory.INTERFACE_LIBRARY, Executable.NOT_EXECUTABLE), - /** A dynamic library. */ + /** A dynamic library built from cc_library srcs. */ + NODEPS_DYNAMIC_LIBRARY( + ".so", + Staticness.DYNAMIC, + "c++-link-nodeps-dynamic-library", + Picness.NOPIC, // Actually PIC but it's not indicated in the file name + ArtifactCategory.DYNAMIC_LIBRARY, + Executable.NOT_EXECUTABLE), + /** A transitive dynamic library used for distribution. */ DYNAMIC_LIBRARY( ".so", Staticness.DYNAMIC, "c++-link-dynamic-library", - Picness.NOPIC, // Actually PIC but it's not indicated in the file name + Picness.NOPIC, // Actually PIC but it's not indicated in the file name ArtifactCategory.DYNAMIC_LIBRARY, Executable.NOT_EXECUTABLE), @@ -256,6 +264,11 @@ public abstract class Link { public boolean isExecutable() { return (executable == Executable.EXECUTABLE); } + + /** Returns true iff this link type is a dynamic library or transitive dynamic library */ + public boolean isDynamicLibrary() { + return this == NODEPS_DYNAMIC_LIBRARY || this == DYNAMIC_LIBRARY; + } } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java index 389176cf0e..005c212084 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java @@ -350,7 +350,7 @@ public final class LinkCommandLine extends CommandLine { } } } - + /** * Returns a raw link command for the given link invocation, including both command and arguments * (argv). The version that uses the expander is preferred, but that one can't be used during diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL index f4cde055c8..cf9b1b8050 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL @@ -279,6 +279,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -288,6 +289,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -300,6 +302,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -310,6 +313,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -320,6 +324,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -332,6 +337,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -344,6 +350,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -359,6 +366,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -372,6 +380,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -385,6 +394,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -415,6 +425,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -428,6 +439,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -441,6 +453,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -454,6 +467,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -467,6 +481,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -763,6 +778,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -788,6 +804,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -804,6 +821,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -822,6 +840,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -962,6 +981,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -1038,6 +1058,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -1067,6 +1088,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -1099,6 +1121,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -1114,6 +1137,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -1185,6 +1209,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -1219,6 +1244,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -1763,6 +1789,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "mac/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -2085,6 +2134,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -2094,6 +2144,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -2106,6 +2157,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -2116,6 +2168,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -2126,6 +2179,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -2138,6 +2192,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -2150,6 +2205,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2165,6 +2221,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2178,6 +2235,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2191,6 +2249,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2221,6 +2280,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2234,6 +2294,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2247,6 +2308,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2260,6 +2322,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2273,6 +2336,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2569,6 +2633,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -2594,6 +2659,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -2610,6 +2676,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -2628,6 +2695,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -2768,6 +2836,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -2844,6 +2913,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -2873,6 +2943,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -2905,6 +2976,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -2920,6 +2992,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -2991,6 +3064,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -3025,6 +3099,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -3569,6 +3644,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "mac/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -3886,6 +3984,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -3895,6 +3994,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -3907,6 +4007,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -3917,6 +4018,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -3927,6 +4029,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -3939,6 +4042,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -3951,6 +4055,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -3966,6 +4071,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -3979,6 +4085,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -3992,6 +4099,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4022,6 +4130,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4035,6 +4144,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4048,6 +4158,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4061,6 +4172,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4074,6 +4186,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4370,6 +4483,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -4395,6 +4509,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -4411,6 +4526,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -4429,6 +4545,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -4569,6 +4686,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -4645,6 +4763,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -4674,6 +4793,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -4706,6 +4826,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -4721,6 +4842,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -4792,6 +4914,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -4826,6 +4949,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -5370,6 +5494,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "mac/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -5687,6 +5834,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -5696,6 +5844,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -5708,6 +5857,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -5718,6 +5868,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -5728,6 +5879,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -5740,6 +5892,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -5752,6 +5905,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5767,6 +5921,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5780,6 +5935,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5793,6 +5949,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5823,6 +5980,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5836,6 +5994,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5849,6 +6008,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5862,6 +6022,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -5875,6 +6036,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -6171,6 +6333,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -6196,6 +6359,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -6212,6 +6376,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -6230,6 +6395,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -6370,6 +6536,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -6446,6 +6613,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -6475,6 +6643,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -6507,6 +6676,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -6522,6 +6692,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -6593,6 +6764,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -6627,6 +6799,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -7171,6 +7344,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "mac/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -7492,6 +7688,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -7501,6 +7698,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -7513,6 +7711,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -7523,6 +7722,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -7533,6 +7733,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -7545,6 +7746,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -7557,6 +7759,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7572,6 +7775,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7585,6 +7789,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7598,6 +7803,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7628,6 +7834,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7641,6 +7848,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7654,6 +7862,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7667,6 +7876,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7680,6 +7890,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -7976,6 +8187,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -8001,6 +8213,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -8017,6 +8230,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -8035,6 +8249,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -8175,6 +8390,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -8251,6 +8467,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -8280,6 +8497,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -8312,6 +8530,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -8327,6 +8546,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -8402,6 +8622,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -8436,6 +8657,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -8982,6 +9204,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "iossim/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -9303,6 +9548,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -9312,6 +9558,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -9324,6 +9571,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -9334,6 +9582,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -9344,6 +9593,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -9356,6 +9606,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -9368,6 +9619,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9383,6 +9635,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9396,6 +9649,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9409,6 +9663,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9439,6 +9694,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9452,6 +9708,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9465,6 +9722,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9478,6 +9736,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9491,6 +9750,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9789,6 +10049,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -9814,6 +10075,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -9830,6 +10092,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -9848,6 +10111,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -9988,6 +10252,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -10064,6 +10329,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -10093,6 +10359,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -10125,6 +10392,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -10140,6 +10408,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -10215,6 +10484,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -10249,6 +10519,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -10795,6 +11066,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "watchsim/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -11117,6 +11411,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -11126,6 +11421,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -11138,6 +11434,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -11148,6 +11445,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -11158,6 +11456,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -11170,6 +11469,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -11182,6 +11482,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11197,6 +11498,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11210,6 +11512,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11223,6 +11526,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11253,6 +11557,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11266,6 +11571,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11279,6 +11585,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11292,6 +11599,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11305,6 +11613,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11601,6 +11910,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -11626,6 +11936,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -11642,6 +11953,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -11660,6 +11972,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -11800,6 +12113,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -11876,6 +12190,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -11905,6 +12220,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -11937,6 +12253,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -11952,6 +12269,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-lc++" flag: "-target" @@ -12051,6 +12369,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -12085,6 +12404,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -12638,6 +12958,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "tvsim/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -12959,6 +13302,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -12968,6 +13312,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -12980,6 +13325,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -12990,6 +13336,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -13000,6 +13347,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -13012,6 +13360,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -13024,6 +13373,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13039,6 +13389,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13052,6 +13403,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13065,6 +13417,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13095,6 +13448,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13108,6 +13462,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13121,6 +13476,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13134,6 +13490,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13147,6 +13504,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13443,6 +13801,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -13468,6 +13827,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -13484,6 +13844,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -13502,6 +13863,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -13642,6 +14004,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -13718,6 +14081,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -13747,6 +14111,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -13779,6 +14144,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -13794,6 +14160,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -13869,6 +14236,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -13903,6 +14271,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -14449,6 +14818,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "iossim/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -14770,6 +15162,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -14779,6 +15172,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -14791,6 +15185,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -14801,6 +15196,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -14811,6 +15207,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -14823,6 +15220,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -14835,6 +15233,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14850,6 +15249,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14863,6 +15263,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14876,6 +15277,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14906,6 +15308,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14919,6 +15322,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14932,6 +15336,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14945,6 +15350,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -14958,6 +15364,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -15254,6 +15661,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -15279,6 +15687,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -15295,6 +15704,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -15313,6 +15723,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -15453,6 +15864,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -15529,6 +15941,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -15558,6 +15971,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -15590,6 +16004,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -15605,6 +16020,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -15702,6 +16118,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -15736,6 +16153,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -16280,6 +16698,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "ios/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -16601,6 +17042,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -16610,6 +17052,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -16622,6 +17065,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -16632,6 +17076,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -16642,6 +17087,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -16654,6 +17100,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -16666,6 +17113,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16681,6 +17129,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16694,6 +17143,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16707,6 +17157,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16737,6 +17188,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16750,6 +17202,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16763,6 +17216,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16776,6 +17230,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -16789,6 +17244,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -17087,6 +17543,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -17112,6 +17569,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -17128,6 +17586,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -17146,6 +17605,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -17286,6 +17746,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -17362,6 +17823,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -17391,6 +17853,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -17423,6 +17886,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -17438,6 +17902,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -17535,6 +18000,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -17569,6 +18035,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -18113,6 +18580,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "watchos/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -18435,6 +18925,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -18444,6 +18935,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -18456,6 +18948,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -18466,6 +18959,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -18476,6 +18970,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -18488,6 +18983,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -18500,6 +18996,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18515,6 +19012,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18528,6 +19026,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18541,6 +19040,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18571,6 +19071,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18584,6 +19085,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18597,6 +19099,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18610,6 +19113,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18623,6 +19127,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18919,6 +19424,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -18944,6 +19450,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -18960,6 +19467,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -18978,6 +19486,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -19118,6 +19627,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -19194,6 +19704,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -19223,6 +19734,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -19255,6 +19767,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -19270,6 +19783,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-lc++" flag: "-target" @@ -19391,6 +19905,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -19425,6 +19940,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -19976,6 +20492,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "tvos/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { @@ -20297,6 +20836,7 @@ toolchain { implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" + implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-alwayslink-static-library" implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" @@ -20306,6 +20846,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" @@ -20318,6 +20859,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,--print-symbol-counts=%{symbol_counts_output}" } @@ -20328,6 +20870,7 @@ toolchain { name: "shared_flag" flag_set { action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-shared" } @@ -20338,6 +20881,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "%{linkstamp_paths}" iterate_over: "linkstamp_paths" @@ -20350,6 +20894,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-o" flag: "%{output_execpath}" @@ -20362,6 +20907,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20377,6 +20923,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20390,6 +20937,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20403,6 +20951,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20433,6 +20982,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20446,6 +20996,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20459,6 +21010,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20472,6 +21024,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20485,6 +21038,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20781,6 +21335,7 @@ toolchain { action: "objc-fully-link" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" action: "c++-link-alwayslink-static-library" action: "c++-link-pic-static-library" @@ -20806,6 +21361,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -20822,6 +21378,7 @@ toolchain { action: "objc++-executable" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "preprocess-assemble" action: "c-compile" action: "c++-compile" @@ -20840,6 +21397,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -20980,6 +21538,7 @@ toolchain { action: "c++-compile" action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-fprofile-generate=%{fdo_instrument_path}" @@ -21056,6 +21615,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "objc-executable" action: "objc++-executable" flag_group { @@ -21085,6 +21645,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" action: "objc-executable" action: "objc++-executable" @@ -21117,6 +21678,7 @@ toolchain { flag_set { action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" flag_group { flag: "-lgcov" @@ -21132,6 +21694,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { } } @@ -21229,6 +21792,7 @@ toolchain { action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" action: "lto-backend" action: "clif-match" flag_group { @@ -21263,6 +21827,7 @@ toolchain { flag_set { action: "c++-link-executable" action: "c++-link-dynamic-library" + action: "c++-link-nodeps-dynamic-library" flag_group { flag: "-Wl,@%{linker_param_file}" } @@ -21807,6 +22372,29 @@ toolchain { implies: "sysroot" } action_config { + config_name: "c++-link-nodeps-dynamic-library" + action_name: "c++-link-nodeps-dynamic-library" + tool { + tool_path: "ios/clang" + execution_requirement: "requires-darwin" + } + implies: "has_configured_linker_path" + implies: "symbol_counts" + implies: "shared_flag" + implies: "linkstamps" + implies: "output_execpath_flags" + implies: "global_whole_archive_open" + implies: "runtime_root_flags" + implies: "input_param_flags" + implies: "legacy_link_flags" + implies: "strip_debug_symbols" + implies: "linker_param_file" + implies: "version_min" + implies: "apple_env" + implies: "cpp_linker_flags" + implies: "sysroot" + } + action_config { config_name: "c++-link-static-library" action_name: "c++-link-static-library" tool { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java index 08d72db76c..997939c84a 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java @@ -315,6 +315,7 @@ public abstract class MockCcSupport { + " expand_if_all_available: 'thinlto_param_file'" + " action: 'c++-link-executable'" + " action: 'c++-link-dynamic-library'" + + " action: 'c++-link-nodeps-dynamic-library'" + " action: 'c++-link-static-library'" + " action: 'c++-link-alwayslink-static-library'" + " action: 'c++-link-pic-static-library'" @@ -400,6 +401,7 @@ public abstract class MockCcSupport { + " action: 'c++-compile'" + " action: 'c++-link-interface-dynamic-library'" + " action: 'c++-link-dynamic-library'" + + " action: 'c++-link-nodeps-dynamic-library'" + " action: 'c++-link-executable'" + " flag_group {" + " flag: 'fdo_instrument_option'" @@ -471,6 +473,9 @@ public abstract class MockCcSupport { emptyActionConfigFor(LinkTargetType.EXECUTABLE.getActionName()); public static final String EMPTY_DYNAMIC_LIBRARY_ACTION_CONFIG = + emptyActionConfigFor(LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName()); + + public static final String EMPTY_TRANSITIVE_DYNAMIC_LIBRARY_ACTION_CONFIG = emptyActionConfigFor(LinkTargetType.DYNAMIC_LIBRARY.getActionName()); public static final String EMPTY_STATIC_LIBRARY_ACTION_CONFIG = diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index d5251d1113..6722d2161c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -777,6 +777,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { MockCcSupport.EMPTY_COMPILE_ACTION_CONFIG, MockCcSupport.EMPTY_EXECUTABLE_ACTION_CONFIG, MockCcSupport.EMPTY_DYNAMIC_LIBRARY_ACTION_CONFIG, + MockCcSupport.EMPTY_TRANSITIVE_DYNAMIC_LIBRARY_ACTION_CONFIG, MockCcSupport.EMPTY_STATIC_LIBRARY_ACTION_CONFIG, MockCcSupport.EMPTY_STRIP_ACTION_CONFIG, MockCcSupport.NO_LEGACY_FEATURES_FEATURE); @@ -796,6 +797,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { MockCcSupport.EMPTY_EXECUTABLE_ACTION_CONFIG, MockCcSupport.EMPTY_STATIC_LIBRARY_ACTION_CONFIG, MockCcSupport.EMPTY_DYNAMIC_LIBRARY_ACTION_CONFIG, + MockCcSupport.EMPTY_TRANSITIVE_DYNAMIC_LIBRARY_ACTION_CONFIG, MockCcSupport.NO_LEGACY_FEATURES_FEATURE, MockCcSupport.PIC_FEATURE); useConfiguration(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index ab5329f6c8..3c3a6d41a3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -107,6 +107,7 @@ public class CppLinkActionTest extends BuildViewTestCase { .getFeatureConfiguration( ImmutableSet.of( Link.LinkTargetType.EXECUTABLE.getActionName(), + Link.LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName(), Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(), Link.LinkTargetType.STATIC_LIBRARY.getActionName(), Link.LinkTargetType.PIC_STATIC_LIBRARY.getActionName(), @@ -324,7 +325,7 @@ public class CppLinkActionTest extends BuildViewTestCase { featureConfiguration, MockCppSemantics.INSTANCE) {}; if (attributesToFlip.contains(NonStaticAttributes.OUTPUT_FILE)) { - builder.setLinkType(LinkTargetType.DYNAMIC_LIBRARY); + builder.setLinkType(LinkTargetType.NODEPS_DYNAMIC_LIBRARY); builder.setLibraryIdentifier("foo"); } else { builder.setLinkType(LinkTargetType.EXECUTABLE); @@ -382,7 +383,7 @@ public class CppLinkActionTest extends BuildViewTestCase { builder.setLinkType( attributes.contains(StaticKeyAttributes.OUTPUT_FILE) ? LinkTargetType.STATIC_LIBRARY - : LinkTargetType.DYNAMIC_LIBRARY); + : LinkTargetType.NODEPS_DYNAMIC_LIBRARY); builder.setLibraryIdentifier("foo"); return builder.build(); } @@ -412,7 +413,7 @@ public class CppLinkActionTest extends BuildViewTestCase { builder.setLinkType(LinkTargetType.STATIC_LIBRARY); assertThat(builder.canSplitCommandLine()).isTrue(); - builder.setLinkType(LinkTargetType.DYNAMIC_LIBRARY); + builder.setLinkType(LinkTargetType.NODEPS_DYNAMIC_LIBRARY); assertThat(builder.canSplitCommandLine()).isTrue(); builder.setInterfaceOutput(outputIfso); @@ -567,7 +568,7 @@ public class CppLinkActionTest extends BuildViewTestCase { "feature {", " name: 'build_interface_libraries'", " flag_set {", - " action: '" + LinkTargetType.DYNAMIC_LIBRARY.getActionName() + "',", + " action: '" + LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName() + "',", " flag_group {", " flag: '%{generate_interface_library}'", " flag: '%{interface_library_builder_path}'", @@ -579,7 +580,7 @@ public class CppLinkActionTest extends BuildViewTestCase { "feature {", " name: 'dynamic_library_linker_tool'", " flag_set {", - " action: 'c++-link-dynamic-library'", + " action: 'c++-link-nodeps-dynamic-library'", " flag_group {", " flag: 'dynamic_library_linker_tool'", " }", @@ -589,8 +590,8 @@ public class CppLinkActionTest extends BuildViewTestCase { " name: 'has_configured_linker_path'", "}", "action_config {", - " config_name: '" + LinkTargetType.DYNAMIC_LIBRARY.getActionName() + "'", - " action_name: '" + LinkTargetType.DYNAMIC_LIBRARY.getActionName() + "'", + " config_name: '" + LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName() + "'", + " action_name: '" + LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName() + "'", " tool {", " tool_path: 'custom/crosstool/scripts/link_dynamic_library.sh'", " }", @@ -602,10 +603,10 @@ public class CppLinkActionTest extends BuildViewTestCase { ImmutableSet.of( "build_interface_libraries", "dynamic_library_linker_tool", - LinkTargetType.DYNAMIC_LIBRARY.getActionName())); + LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName())); CppLinkActionBuilder builder = createLinkBuilder( - LinkTargetType.DYNAMIC_LIBRARY, + LinkTargetType.NODEPS_DYNAMIC_LIBRARY, "foo.so", ImmutableList.<Artifact>of(), ImmutableList.<LibraryToLink>of(), diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java index 2363a3e9cc..70c56b87ee 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java @@ -54,7 +54,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.DYNAMIC_LIBRARY); + Variables variables = getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); VariableValue librariesToLinkSequence = variables.getVariable(CppLinkActionBuilder.LIBRARIES_TO_LINK_VARIABLE); assertThat(librariesToLinkSequence).isNotNull(); @@ -117,7 +117,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.DYNAMIC_LIBRARY); + Variables variables = getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); String interfaceLibraryBuilder = getVariableValue(variables, CppLinkActionBuilder.INTERFACE_LIBRARY_BUILDER_VARIABLE); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java index e3d26c2787..880be4dec0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java @@ -43,6 +43,7 @@ public class LinkBuildVariablesTestCase extends BuildViewTestCase { case ALWAYS_LINK_PIC_STATIC_LIBRARY: linkerOutput = getBinArtifact("lib" + target.getLabel().getName() + "pic.a", target); break; + case NODEPS_DYNAMIC_LIBRARY: case DYNAMIC_LIBRARY: linkerOutput = getBinArtifact("lib" + target.getLabel().getName() + ".so", target); break; |