summaryrefslogtreecommitdiff
path: root/engine/SCons/Environment.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-08-10 08:40:42 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-08-10 08:40:42 +0200
commit27631795932da669a3cb2543804aa4059131025f (patch)
tree7c621da5eab4fade5566feb544a1b299fa8503bc /engine/SCons/Environment.py
parenta0a7e6a528813424826ab447a0a01e61ee47a546 (diff)
parent829062d4941d1ee8e36c442adadb7f0f91b09a09 (diff)
Merge branch 'feature/upstrem' into develop
Diffstat (limited to 'engine/SCons/Environment.py')
-rw-r--r--engine/SCons/Environment.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/SCons/Environment.py b/engine/SCons/Environment.py
index 31a4721..7a0954d 100644
--- a/engine/SCons/Environment.py
+++ b/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)