From cb90a7eb93c25b37ef3868768c636ed349ca35e5 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Mon, 29 Sep 2025 14:33:06 -0600 Subject: [PATCH 1/3] ensure filter-out applies to subsequent sdk versions --- Makefile.system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.system b/Makefile.system index 38646c3c6b..e81ccf0834 100644 --- a/Makefile.system +++ b/Makefile.system @@ -436,7 +436,7 @@ ifeq (x$(XCVER), x 15) CCOMMON_OPT += -Wl,-ld_classic FCOMMON_OPT += -Wl,-ld_classic endif -ifeq (x$(XCVER), x 16) +ifeq ($(shell [ $(XCVER) -ge 16 ] && echo yes),yes) ifeq ($(F_COMPILER), GFORTRAN) override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) endif From a39daaaf0af8d6c6bfb5c77ff7bfeb73cde3973c Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 30 Sep 2025 12:03:21 +0200 Subject: [PATCH 2/3] fix merge conflict --- Makefile.system | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.system b/Makefile.system index 01632a927c..18e8929137 100644 --- a/Makefile.system +++ b/Makefile.system @@ -446,6 +446,7 @@ ifeq ($(F_COMPILER), GFORTRAN) override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) endif endif +endif ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly)) MD5SUM = md5 -r From 880e3cb58bc98af27ede8a3ad895331330a9fa6b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 30 Sep 2025 14:38:29 +0200 Subject: [PATCH 3/3] fix merge conflict --- Makefile.system | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.system b/Makefile.system index 18e8929137..6241006a81 100644 --- a/Makefile.system +++ b/Makefile.system @@ -442,11 +442,9 @@ CCOMMON_OPT += -Wl,-ld_classic FCOMMON_OPT += -Wl,-ld_classic endif ifeq ($(shell [ $(XCVER) -ge 16 ] && echo yes),yes) -ifeq ($(F_COMPILER), GFORTRAN) override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) endif endif -endif ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly)) MD5SUM = md5 -r