Skip to content

Commit e976e82

Browse files
committed
Get rid of f2c-way to compile Fortran
commit_hash:e96a148f9fc8270c69d57afb357e537f8f51d814
1 parent ebfe59d commit e976e82

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

build/ymake.core.conf

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3339,15 +3339,10 @@ macro _SRC("ssqls", SRC, SRCFLAGS...) {
33393339
.STRUCT_CMD=yes
33403340
}
33413341

3342-
macro _SRC_f_new(SRC, SRCFLAGS...) {
3342+
macro _SRC("f", SRC, SRCFLAGS...) {
33433343
.CMD=${FLANG_RESOURCE_GLOBAL}/bin/flang-new $C_FLAGS_PLATFORM -c ${input:SRC} -o ${output;suf=.o:SRC} ${hide;kv:"p FL"} ${hide;kv:"pc light-green"}
33443344
.PEERDIR=build/platform/flang contrib/libs/llvm/flang-rt
3345-
}
3346-
3347-
macro _SRC_f_old(SRC, SRCFLAGS...) {
3348-
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/f2c.py"} -t ${tool:"contrib/tools/f2c"} -c ${input:SRC} -o ${output;suf=.c:SRC} ${hide;output_include:"f2c.h"} ${hide;kv:"p FT"} ${hide;kv:"pc light-green"}
3349-
.PEERDIR=contrib/libs/libf2c
3350-
.ADDINCL=contrib/libs/libf2c
3345+
.STRUCT_CMD=yes
33513346
}
33523347

33533348
### @usage: AR_PLUGIN(plugin_name)
@@ -3370,21 +3365,6 @@ macro LD_PLUGIN(Name) {
33703365
.STRUCT_SEM=yes
33713366
}
33723367

3373-
USE_FLANG=yes
3374-
3375-
when ($USE_FLANG == "yes") {
3376-
_SRC_FLANG=$_SRC_f_new($SRC $SRCFLAGS)
3377-
}
3378-
otherwise {
3379-
_SRC_FLANG=$_SRC_f_old($SRC $SRCFLAGS)
3380-
}
3381-
3382-
# tag:src-processing
3383-
macro _SRC("f", SRC, SRCFLAGS...) {
3384-
.CMD=$_SRC_FLANG
3385-
.STRUCT_CMD=yes
3386-
}
3387-
33883368
_SRC_CPP_TOOLCHAIN_INFO_PEER=
33893369

33903370
# tag:src-processing

0 commit comments

Comments
 (0)