Set different arguments for gcc3.x.x and gcc4.x.x. Suppress pointer-sign warning...

[mirror_edk2.git] / Tools / Source / TianoTools / build.xml

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 5d3770ae0f5f4fe545070d0f941f0d32b279fd1b..982b920e1797239e12c2972992c3c318990ee61f 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -94,16 +94,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <isset property="env.TOOL_CHAIN" />\r
           <then>\r
             <property name="ToolChain" value="${env.TOOL_CHAIN}"/>\r
-            <property name="ExtraArgus" value="-Wno-pointer-sign" />\r
           </then>\r
           <else>\r
             <!-- Default Tool Chain is Microsoft Visual Studio -->\r
             <property name="ToolChain" value="msvc"/>\r
-            <property name="ExtraArgus" value="" />\r
           </else>\r
         </if>\r
       </then>\r
     </if>\r
+    \r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="gcc" />\r
+      <then>\r
+        <exec executable="gcc" outputproperty="host.gcc.ver">\r
+          <arg line="-E" />\r
+          <arg line="-P" />\r
+          <arg line="-x c" />\r
+          <arg line="gcc.ver" />\r
+        </exec>\r
+        <if>\r
+          <contains string="${host.gcc.ver}" substring="4" />\r
+          <then>\r
+            <property name="ExtraArgus" value="-Wno-pointer-sign" />\r
+          </then>\r
+        </if>\r
+      </then>\r
+    </if>\r
 \r
     <condition property="linux" value="true">\r
       <os name="Linux"/>\r