summaryrefslogtreecommitdiff
path: root/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
diff options
context:
space:
mode:
authorVikas Rangarajan <vikas@vikas-linux.tva.tvworks.com>2010-03-23 12:31:32 -0700
committerVikas Rangarajan <vikas@vikas-linux.tva.tvworks.com>2010-03-23 12:31:32 -0700
commitcf6891934297c51cd12bac3278b6e59df5e42f06 (patch)
tree2de4867e2894d4c12c7c274f353737e7eea2dd93 /src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
parent8e6ef7c8c3b8417c0d6ea4aae220b029977c2d34 (diff)
downloadcpptasks-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/GccCCompiler.java')
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java3
1 files changed, 2 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
}