Skip to content

Flip --incompatible_avoid_hardcoded_objc_compilation_flags #27027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Flip --incompatible_avoid_hardcoded_objc_compilation_flags #27027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class ObjcCommandLineOptions extends FragmentOptions {

@Option(
name = "incompatible_avoid_hardcoded_objc_compilation_flags",
defaultValue = "false",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {
OptionEffectTag.AFFECTS_OUTPUTS,
Expand Down
14 changes: 12 additions & 2 deletions src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,14 @@ public void testPopulatesCompilationArtifacts() throws Exception {
checkPopulatesCompilationArtifacts(RULE_TYPE);
}

@Test
public void testCompilationActionsForDebugLegacyFlags() throws Exception {
checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.DBG, true);
}

@Test
public void testCompilationActionsForDebug() throws Exception {
checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.DBG);
checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.DBG, false);
}

@Test
Expand Down Expand Up @@ -1169,9 +1174,14 @@ public void testClangCoptsForDebugModeWithoutGlibOrHardcoding() throws Exception
.containsNoneOf("-D_GLIBCXX_DEBUG", "-DDEBUG=1");
}

@Test
public void testCompilationActionsForOptimizedLegacyFlags() throws Exception {
checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.OPT, true);
}

@Test
public void testCompilationActionsForOptimized() throws Exception {
checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.OPT);
checkClangCoptsForCompilationMode(RULE_TYPE, CompilationMode.OPT, false);
}

@Test
Expand Down
18 changes: 10 additions & 8 deletions src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,12 @@ private static String compilationModeFlag(CompilationMode mode) {
throw new AssertionError();
}

protected static ImmutableList<String> compilationModeCopts(CompilationMode mode) {
protected static ImmutableList<String> legacyCompilationModeCopts(CompilationMode mode) {
switch (mode) {
case DBG:
return ImmutableList.copyOf(ObjcConfiguration.DBG_COPTS);
case OPT:
return ObjcConfiguration.OPT_COPTS;
case FASTBUILD:
return FASTBUILD_COPTS;
}
throw new AssertionError();
}
Expand Down Expand Up @@ -890,13 +888,18 @@ protected List<String> rootedIncludePaths(String... unrootedPaths) {
return rootedPaths.build();
}

protected void checkClangCoptsForCompilationMode(RuleType ruleType, CompilationMode mode)
protected void checkClangCoptsForCompilationMode(RuleType ruleType, CompilationMode mode, boolean includeLegacyFlags)
throws Exception {
ImmutableList.Builder<String> allExpectedCoptsBuilder =
ImmutableList.<String>builder()
.addAll(CompilationSupport.DEFAULT_COMPILER_FLAGS)
.addAll(compilationModeCopts(mode));
.addAll(CompilationSupport.DEFAULT_COMPILER_FLAGS);

if (includeLegacyFlags) {
allExpectedCoptsBuilder.addAll(legacyCompilationModeCopts(mode));
}

useConfiguration(
"--incompatible_avoid_hardcoded_objc_compilation_flags=" + !includeLegacyFlags,
"--platforms=" + MockObjcSupport.IOS_X86_64,
"--apple_platform_type=ios",
"--compilation_mode=" + compilationModeFlag(mode));
Expand All @@ -913,8 +916,7 @@ protected void checkClangCoptsForCompilationMode(RuleType ruleType, CompilationM
protected void checkClangCoptsForDebugModeWithoutGlib(RuleType ruleType) throws Exception {
ImmutableList.Builder<String> allExpectedCoptsBuilder =
ImmutableList.<String>builder()
.addAll(CompilationSupport.DEFAULT_COMPILER_FLAGS)
.addAll(ObjcConfiguration.DBG_COPTS);
.addAll(CompilationSupport.DEFAULT_COMPILER_FLAGS);

useConfiguration(
"--platforms=" + MockObjcSupport.IOS_X86_64,
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ def swift_binary_impl(ctx):
""");

useConfiguration(
"--incompatible_avoid_hardcoded_objc_compilation_flags=false",
"--compilation_mode=opt",
"--ios_simulator_device='iPhone 6'",
"--ios_simulator_version=8.4",
Expand Down
Loading