Fix ASPPCOM value for gas.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@461 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 257cac3183cbf7127a433c380c9799add3758d7d..1a00b438eaf6d038db9f58fb4917517fa2c1f261 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -29,6 +29,9 @@ RELEASE 0.09 -
  - Supply an error message if there are no command-line or
    Default() targets specified.
 
+  - Fix the ASPPCOM values for the GNU assembler.
+    (Bug reported by Brett Polivka.)
+
  From Anthony Roach:
 
  - Fixed use of command lines with spaces in their arguments,
@@ -51,6 +54,8 @@ RELEASE 0.09 -
    utility is available, which is much faster than fork()/exec(),
    and fixes the -j option on several platforms.
 
+  - Fix use of -j with multiple targets.
+
   From sam th:
 
   - Dynamically check for the existence of utilities with which to

diff --git a/src/engine/SCons/Tool/gas.py b/src/engine/SCons/Tool/gas.py
index 8d24348008018503b43525fd8a2e6d1da540f0f0..226e3bd8e9e78f1974a587c54e5d457349aff203 100644 (file)
--- a/src/engine/SCons/Tool/gas.py
+++ b/src/engine/SCons/Tool/gas.py
@@ -61,7 +61,7 @@ def generate(env, platform):
     env['AS']        = env.Detect(assemblers) or 'as'
     env['ASFLAGS']   = ''
     env['ASCOM']     = '$AS $ASFLAGS -o $TARGET $SOURCES'
-    env['ASPPCOM']   = '$CC $ASFLAGS $CPPFLAGS -o $TARGET $SOURCES'
+    env['ASPPCOM']   = '$CC $ASFLAGS $CPPFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES'
 
 def exists(env):
     return env.Detect(assemblers)