summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cleeland <chris.cleeland@gmail.com>2010-07-27 15:41:16 +0000
committerChris Cleeland <chris.cleeland@gmail.com>2010-07-27 15:41:16 +0000
commit950e3201b8e1ae0dd160cf4ad272b3759afddde0 (patch)
treecd2747f9daf240d230a7d92331687f49bf0c9ff3
parent7db7f7f2591f95247d60ba3c52a724723ce1bec3 (diff)
downloadMPC-950e3201b8e1ae0dd160cf4ad272b3759afddde0.tar.gz
Added missing space between thread flags and pic flags.
-rw-r--r--ChangeLog5
-rw-r--r--templates/cdt6cproject.mpd2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 70ed3f09..7fa1e59a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 27 15:40:16 UTC 2010 Chris Cleeland <cleeland@ociweb.com>
+
+ * templates/cdt6cproject.mpd: Added missing space between thread
+ flags and pic flags.
+
Wed Jul 21 20:34:03 UTC 2010 Chris Cleeland <cleeland@ociweb.com>
Merge out the following changes from the eclipse branch:
diff --git a/templates/cdt6cproject.mpd b/templates/cdt6cproject.mpd
index 9a00ac49..37a991d1 100644
--- a/templates/cdt6cproject.mpd
+++ b/templates/cdt6cproject.mpd
@@ -116,7 +116,7 @@
<listOptionValue builtIn="false" value="<%if(!starts_with(include, [/\\\$]))%>../../<%endif%><%translate_vars(include, 1)%>"/>
<%endfor%>
</option>
-<option id="gnu.cpp.compiler.option.other.other.375481234" superClass="gnu.cpp.compiler.option.other.other" value="-c <%comment(here's where we can put in all the extra compiler flags)%><%cxxflags%><%if(use_threads)%> <%threadflags%><%endif%><%if(dll_ext && pic)%><%pic%><%endif%>" valueType="string"/>
+<option id="gnu.cpp.compiler.option.other.other.375481234" superClass="gnu.cpp.compiler.option.other.other" value="-c <%comment(here's where we can put in all the extra compiler flags)%><%cxxflags%><%if(use_threads)%> <%threadflags%><%endif%><%if(dll_ext && pic)%> <%pic%><%endif%>" valueType="string"/>
<option id="gnu.cpp.compiler.<%if(platform_specializer)%><%platform_specializer%>.<%endif%><%project_type%>.<%configuration%>.option.optimization.level.886842330" name="Optimization Level" superClass="gnu.cpp.compiler.<%if(platform_specializer)%><%platform_specializer%>.<%endif%><%project_type%>.<%configuration%>.option.optimization.level" value="gnu.cpp.compiler.optimization.level.<%optimization_level%>" valueType="enumerated"/>
<option id="gnu.cpp.compiler.<%if(platform_specializer)%><%platform_specializer%>.<%endif%><%project_type%>.<%configuration%>.option.debugging.level.63360527" name="Debug Level" superClass="gnu.cpp.compiler.<%if(platform_specializer)%><%platform_specializer%>.<%endif%><%project_type%>.<%configuration%>.option.debugging.level" value="gnu.cpp.compiler.debugging.level.<%debugging_level%>" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.preprocessor.def.1310953196" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">