Reintroduce -nostdinc for all system except macOS
#7684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Olivier Voortman <olivier.voortman@gmail.com>
Instead of using toString().
macOS won't have `-nostdinc` until we support properly framework search path discovery.
lacasseio
added
in:native-platform
|
expect or except? |
…sh-code Display only BuildCacheKey.getHashCode()
big-guy
changed the title
-nostdinc for all system expect macOS-nostdinc for all system except macOS
big-guy
requested changes
Nov 9, 2018
| @@ -33,7 +34,7 @@ | |||
| private static class CCompileArgsTransformer extends GccCompilerArgsTransformer<CCompileSpec> { | |||
| @Override | |||
| protected boolean isNoStandardIncludes() { | |||
| return false; | |||
| return !OperatingSystem.current().isMacOsX(); | |||
There was a problem hiding this comment.
This is a minor thing, but I think this should be based on the target platform (not that you could cross compile if you wanted to). We pass -nostdinc for everything except macOS.
| @@ -32,7 +33,7 @@ public CPCHCompiler(BuildOperationExecutor buildOperationExecutor, CompilerOutpu | |||
| private static class CPCHCompileArgsTransformer extends GccCompilerArgsTransformer<CPCHCompileSpec> { | |||
| @Override | |||
| protected boolean isNoStandardIncludes() { | |||
| return false; | |||
| return !OperatingSystem.current().isMacOsX(); | |||
| @@ -33,7 +34,7 @@ | |||
| private static class CppCompileArgsTransformer extends GccCompilerArgsTransformer<CppCompileSpec> { | |||
| @Override | |||
| protected boolean isNoStandardIncludes() { | |||
| return false; | |||
| return !OperatingSystem.current().isMacOsX(); | |||
| @@ -32,7 +33,7 @@ public CppPCHCompiler(BuildOperationExecutor buildOperationExecutor, CompilerOut | |||
| private static class CppPCHCompileArgsTransformer extends GccCompilerArgsTransformer<CppPCHCompileSpec> { | |||
| @Override | |||
| protected boolean isNoStandardIncludes() { | |||
| return false; | |||
| return !OperatingSystem.current().isMacOsX(); | |||
| @@ -34,7 +36,9 @@ class CCompilerTest extends GccCompatibleNativeCompilerTest { | |||
| @Override | |||
| protected List<String> getCompilerSpecificArguments(File includeDir, File systemIncludeDir) { | |||
| def arguments = super.getCompilerSpecificArguments(includeDir, systemIncludeDir) | |||
| arguments.remove('-nostdinc') | |||
| if (OperatingSystem.current().macOsX) { | |||
There was a problem hiding this comment.
can this just get moved up to the parent's method so we don't add -nostdinc to begin with?
| @@ -35,7 +36,9 @@ class CPCHCompilerTest extends GccCompatibleNativeCompilerTest { | |||
| @Override | |||
| protected List<String> getCompilerSpecificArguments(File includeDir, File systemIncludeDir) { | |||
| def arguments = super.getCompilerSpecificArguments(includeDir, systemIncludeDir) | |||
| arguments.remove('-nostdinc') | |||
| if (OperatingSystem.current().macOsX) { | |||
| @@ -35,7 +36,9 @@ class CppCompilerTest extends GccCompatibleNativeCompilerTest { | |||
| @Override | |||
| protected List<String> getCompilerSpecificArguments(File includeDir, File systemIncludeDir) { | |||
| def arguments = super.getCompilerSpecificArguments(includeDir, systemIncludeDir) | |||
| arguments.remove('-nostdinc') | |||
| if (OperatingSystem.current().macOsX) { | |||
| @@ -35,7 +36,9 @@ class CppPCHCompilerTest extends GccCompatibleNativeCompilerTest { | |||
| @Override | |||
| protected List<String> getCompilerSpecificArguments(File includeDir, File systemIncludeDir) { | |||
| def arguments = super.getCompilerSpecificArguments(includeDir, systemIncludeDir) | |||
| arguments.remove('-nostdinc') | |||
| if (OperatingSystem.current().macOsX) { | |||
|
@pzygielo except. For all platforms except for macOS, we want to restrict the include path used by the compiler to the set that Gradle knows about. We need to do a little more work to get this to work on macOS (to support Frameworks). |
Set CONSTANT_TIME_FOR_TAR_ENTRIES to epoch + 1 day (#7564)
* origin/lacasseio/native/nostdinc-linux: Reintroduce `-nostdinc` for all system expect macOS
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
macOS won't have
-nostdincuntil we support properly framework searchpath discovery.
Context
Fixes gradle/gradle-native#925
Gradle Core Team Checklist