Skip to content

Commit 880e3cb

Browse files
authored
fix merge conflict
1 parent a39daaa commit 880e3cb

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

Makefile.system

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,11 +442,9 @@ CCOMMON_OPT += -Wl,-ld_classic
442442
FCOMMON_OPT += -Wl,-ld_classic
443443
endif
444444
ifeq ($(shell [ $(XCVER) -ge 16 ] && echo yes),yes)
445-
ifeq ($(F_COMPILER), GFORTRAN)
446445
override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB)))
447446
endif
448447
endif
449-
endif
450448

451449
ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly))
452450
MD5SUM = md5 -r

0 commit comments

Comments
 (0)