Skip to content

Commit

Permalink
Merge pull request #75 from JeffersonLab/pasteurize_mmi
Browse files Browse the repository at this point in the history
Pasteurize mmi
  • Loading branch information
sdobbs authored Nov 18, 2020
2 parents cf1f4bd + 8164837 commit 3f28e1c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 189 deletions.
15 changes: 12 additions & 3 deletions SConstruct
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@

from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import unicode_literals

from builtins import int
from builtins import str
from builtins import map
from future import standard_library
standard_library.install_aliases()
import os
import sys
import subprocess
Expand All @@ -20,7 +29,7 @@ osname = os.getenv('BMS_OSNAME', 'build')

# Get gcc major version
proc=subprocess.Popen('./gccversion.sh', shell=True, stdout=subprocess.PIPE, )
gcc_version_str=proc.communicate()[0]
gcc_version_str=str(proc.communicate()[0], 'utf-8')
gcc_version = int(gcc_version_str.rstrip("\n"))
print('gcc_version =', gcc_version)

Expand Down Expand Up @@ -72,7 +81,7 @@ if SHOWBUILD==0:
# Turn on debug symbols and warnings
env.PrependUnique( CFLAGS = ['-g', '-fPIC', '-Wall'])
env.PrependUnique( CXXFLAGS = ['-g', '-fPIC', '-Wall'])
if gcc_version >= 9:
if gcc_version >= 10:
env.PrependUnique(FORTRANFLAGS = ['-g', '-fPIC', '-fallow-argument-mismatch'])
else:
env.PrependUnique(FORTRANFLAGS = ['-g', '-fPIC'])
Expand Down
186 changes: 0 additions & 186 deletions SConstruct3

This file was deleted.

0 comments on commit 3f28e1c

Please sign in to comment.