diff options
author | Steven Knight <knight@baldmt.com> | 2008-05-18 05:12:35 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2008-05-18 05:12:35 (GMT) |
commit | 61173c84a9f0535b47b21b9c2623dc5f853d9ca0 (patch) | |
tree | 97e2df9b08fd971d661d41e0ce1bc169c4d7efa7 /src/engine/SCons/Tool/g77.py | |
parent | 64daa285c6d9089cd74a988d5512f2007bf7254f (diff) | |
download | SCons-61173c84a9f0535b47b21b9c2623dc5f853d9ca0.zip SCons-61173c84a9f0535b47b21b9c2623dc5f853d9ca0.tar.gz SCons-61173c84a9f0535b47b21b9c2623dc5f853d9ca0.tar.bz2 |
Merged revisions 2928-2932,2934-2946 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core
........
r2932 | garyo | 2008-04-30 09:14:38 -0700 (Wed, 30 Apr 2008) | 1 line
Add doc for site_scons dir and related options. Closes issue #1996.
........
r2934 | stevenknight | 2008-04-30 22:05:38 -0700 (Wed, 30 Apr 2008) | 3 lines
Issue 2039: Fix a syntax error in Intel C compiler support on Windows.
(Jonas Olsson)
........
r2935 | belley | 2008-05-01 06:59:21 -0700 (Thu, 01 May 2008) | 10 lines
test/KeyboardInterrupt.py no longer hangs under Cygwin.
There seems to be a bug on Cygwin where the compiler process hangs
after sending the SIGINT signal to the process group. It is probably a
bug in cygwin1.dll, or maybe in the Python 'C' code or the Python
subprocess module. We therefore do not use 'killpg' on Cygwin.
Benoit
........
r2936 | belley | 2008-05-01 07:10:23 -0700 (Thu, 01 May 2008) | 12 lines
cell_contents not defined in python < 2.5. [Issue 2035]
Some versions of Python supports lexical scoping of local variables
(aka closures) but not the cell_contents attribute that would allow
the FunctionAction signature that take the content of these closure
cells into account. The access to the cell_contents attribute is now
protected with a try/except AttributeError so that at least the other
parts of the function signature are properly computed.
Benoit
........
r2937 | stevenknight | 2008-05-01 12:08:25 -0700 (Thu, 01 May 2008) | 3 lines
When running tests, allow the user to set the $SCONSIGN variable to pick a
specific sconsign script to execute.
........
r2938 | stevenknight | 2008-05-02 19:13:14 -0700 (Fri, 02 May 2008) | 2 lines
Set svn:ignore to '*.py[co]'.
........
r2939 | stevenknight | 2008-05-08 21:07:18 -0700 (Thu, 08 May 2008) | 4 lines
Issue 2033: Fix excessive memory use when a Python Value node's
representation is stored in a .sconsign file and then re-stored
after being interpreted with escaped backslashes and quotes.
........
r2940 | cournape | 2008-05-16 03:56:49 -0700 (Fri, 16 May 2008) | 1 line
Fix issue 2054.
........
r2941 | stevenknight | 2008-05-16 12:02:45 -0700 (Fri, 16 May 2008) | 8 lines
Issue 2045: After a Node has failed its build and we're propagating
the failure to other Nodes on the candidate list, don't marke candidate
Nodes as FAILED if they've already been visited and been determined
to be up-to-date. This avoids problems with Configure tests not
running because failure of an earlier Configure tests caused (e.g.)
/usr/bin/g++ to get marked as FAILED, making SCons think it doesn't
need to bother trying to rebuild anything that will use it...
........
r2942 | stevenknight | 2008-05-16 12:10:14 -0700 (Fri, 16 May 2008) | 8 lines
Improve the regular expressions used by the test infrastructure to
examine SCons output to decide if a list of targets are considered
up-to-date or not. The new code uses the re.escape() function instead
of hand-escaping '.' and '\n'. This required a little restructuring in
the not_up_to_date() method to escape the characters within the arguments
themselves, but not the surrounding characters we use to construct the
regex that makes sure those strings *don't* exist in the output.
........
r2943 | stevenknight | 2008-05-16 14:04:23 -0700 (Fri, 16 May 2008) | 3 lines
Issue 2049: Handle multiple pipe-separated values in Visual Studio for
INCLUDE, LIB and PATH. Still only uses Win32, not any other values.
........
r2944 | stevenknight | 2008-05-16 18:36:27 -0700 (Fri, 16 May 2008) | 2 lines
Record changes by David Cournapeau and Benoit Belley.
........
r2945 | stevenknight | 2008-05-17 07:13:46 -0700 (Sat, 17 May 2008) | 3 lines
Pass in dc as a keyword argument to _smartLink for older Python versions
without nested scopes.
........
r2946 | stevenknight | 2008-05-17 07:14:01 -0700 (Sat, 17 May 2008) | 3 lines
Expect a warning about shadowing global variables on Python 2.1.
(This code can go away after we release 1.0.)
........
Diffstat (limited to 'src/engine/SCons/Tool/g77.py')
-rw-r--r-- | src/engine/SCons/Tool/g77.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/g77.py b/src/engine/SCons/Tool/g77.py index 058b061..66d3d89 100644 --- a/src/engine/SCons/Tool/g77.py +++ b/src/engine/SCons/Tool/g77.py @@ -48,8 +48,8 @@ def generate(env): env['SHFORTRANFLAGS'] = SCons.Util.CLVar('$FORTRANFLAGS') env['SHF77FLAGS'] = SCons.Util.CLVar('$F77FLAGS') else: - env['SHFORTRANFLAGS'] = SCons.Util.CLVar('$SHFORTRANFLAGS -fPIC') - env['SHF77FLAGS'] = SCons.Util.CLVar('$SHF77FLAGS -fPIC') + env['SHFORTRANFLAGS'] = SCons.Util.CLVar('$FORTRANFLAGS -fPIC') + env['SHF77FLAGS'] = SCons.Util.CLVar('$F77FLAGS -fPIC') env['FORTRAN'] = fcomp env['SHFORTRAN'] = '$FORTRAN' |