diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-10-07 17:50:46 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-10-07 17:50:46 +0200 |
| commit | 957d7c1366611f7239a9de1e985056ef52146914 (patch) | |
| tree | 446c6a1ae777002d536d62d87290ec91b6fae337 /src/engine/SCons/Environment.py | |
| parent | d2798622a34a90a7e921148d1d0bf5d9084c1319 (diff) | |
| parent | 56337453f0f3fbe34255e636d5d65974f4d17681 (diff) | |
Update upstream source from tag 'upstream/3.1.1'
Update to upstream version '3.1.1'
with Debian dir bba4b038eb8bdc3d9cc89cb032c6fa6fa0985af1
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 31a4721..7a0954d 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -31,7 +31,7 @@ Environment # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Environment.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" +__revision__ = "src/engine/SCons/Environment.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan" import copy @@ -783,6 +783,7 @@ class SubstitutionEnvironment(object): elif arg in ['-mno-cygwin', '-pthread', '-openmp', + '-fmerge-all-constants', '-fopenmp']: dict['CCFLAGS'].append(arg) dict['LINKFLAGS'].append(arg) |