Skip to content

Commit 9a923d0

Browse files
committed
gfrotran wrapper tool recognizes FASTR_FC, which allows to override the Fortran compiler
1 parent 323c8c5 commit 9a923d0

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

com.oracle.truffle.r.native/run/fastr_etc/Darwin/Makeconf.llvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

com.oracle.truffle.r.native/run/fastr_etc/Darwin/Makeconf.native

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

com.oracle.truffle.r.native/run/fastr_etc/Linux/Makeconf.llvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

com.oracle.truffle.r.native/run/fastr_etc/Linux/Makeconf.native

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

com.oracle.truffle.r.native/run/fastr_tools/safe-forward-gfortran

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
2727
# We do not use the generic safe-forward-tool, because we expect gfortran to be by far the
2828
# most problematic tool and we want to provide some more gfortan specific guidance.
2929

30-
if command -v gfortran>/dev/null; then
30+
if [ "${FASTR_FC+dummy}" != dummy ]; then
31+
exec "$FASTR_FC" "$@"
32+
elif command -v gfortran>/dev/null; then
3133
exec gfortran "$@"
3234
else
3335
>&2 echo "R package installation or similar process tried to use the 'gfortran' tool, the Fortran compiler from the GNU Compiler Collection (GCC)."

0 commit comments

Comments
 (0)