Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into fortran_compilation
  • Loading branch information
Amaras authored Nov 28, 2021
commit ee432e15c1db4b407bcfcaa08ffd71a3ac68ca5c
5 changes: 4 additions & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ rust_rustc_builder = Builder(action='rustc $SOURCE -o $TARGET$PROGSUFFIX')
go_builder = Builder(action='go build -o $TARGET$PROGSUFFIX $SOURCE')

env = Environment(ENV=os.environ,
BUILDERS={'rustc': rust_rustc_builder, 'cargo': rust_cargo_builder},
BUILDERS={'rustc': rust_rustc_builder,
'cargo': rust_cargo_builder,
'Go': go_builder},
tools=['gcc', 'gnulink', 'g++', 'gas', 'gfortran'])

env['CCFLAGS'] = ''
Expand All @@ -32,6 +34,7 @@ languages = {
'cpp': 'cpp',
'asm-x64': 's',
'rust': 'rs',
'go': 'go'
'fortran': 'f90',
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.