diff options
author | Vikas Rangarajan <vikas@vikas-linux.tva.tvworks.com> | 2010-03-23 12:31:32 -0700 |
---|---|---|
committer | Vikas Rangarajan <vikas@vikas-linux.tva.tvworks.com> | 2010-03-23 12:31:32 -0700 |
commit | cf6891934297c51cd12bac3278b6e59df5e42f06 (patch) | |
tree | 2de4867e2894d4c12c7c274f353737e7eea2dd93 /src/main/java/net/sf/antcontrib/cpptasks/gcc | |
parent | 8e6ef7c8c3b8417c0d6ea4aae220b029977c2d34 (diff) | |
download | cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.tar.gz cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.tar.bz2 cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.tar.xz cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.zip |
Initial merge of local changes with master, main changes :
- Distinguish between system and non-system headers for compilers that support it (g++)
- only recurse dependencies for direct includes of current source
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/gcc')
-rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java | 3 | ||||
-rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java index 33f5018..bbc72f0 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java @@ -135,7 +135,8 @@ public final class GccCCompiler extends GccCompatibleCCompiler { // BEGINFREEHEP // Add -fno_rtti only for g++ and c++ if (!getCommand().equals("g77") && !getCommand().equals("gcc") && (rtti != null) && (!rtti.booleanValue())) { - args.addElement("-fno_rtti"); + // Darren Sargent: fix RTTI option + args.addElement("-fno-rtti"); } // ENDFREEHEP } diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java index 0fce11b..560b608 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java @@ -142,9 +142,17 @@ public abstract class GccCompatibleCCompiler extends CommandLineCCompiler { protected File[] getEnvironmentIncludePath() { return CUtil.getPathFromEnvironment("INCLUDE", ":"); } + // Darren Sargent 22Oct2008 - added overloads to properly handle system paths public String getIncludeDirSwitch(String includeDir) { + return getIncludeDirSwitch(includeDir, false); + } + public String getIncludeDirSwitch(String includeDir, boolean isSystem) { + if ( isSystem ) { + return "-isystem" + includeDir; + } else { return "-I" + includeDir; } + } public void getUndefineSwitch(StringBuffer buffer, String define) { buffer.append("-U"); buffer.append(define); |