From 0e04710099df5dd9369d49d435488c6f3705691a Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 10 Feb 2022 23:03:05 +0100 Subject: [PATCH 1/2] filter out libflangmain as well --- f_check | 1 + 1 file changed, 1 insertion(+) diff --git a/f_check b/f_check index 4825fb09a..71293b53f 100644 --- a/f_check +++ b/f_check @@ -361,6 +361,7 @@ if ($link ne "") { ($flags =~ /^\-l/) && ($flags !~ /ibrary/) && ($flags !~ /gfortranbegin/) + && ($flags !~ /flangmain/) && ($flags !~ /frtbegin/) && ($flags !~ /pathfstart/) && ($flags !~ /crt[0-9]/) From db7a03dd4c414c8053090bf5bcc18f0fc8e01095 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 10 Feb 2022 23:04:45 +0100 Subject: [PATCH 2/2] keep flang-classic on MacOS from trying to create an executable instead of a library --- exports/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exports/Makefile b/exports/Makefile index 903836dd6..baaa33623 100644 --- a/exports/Makefile +++ b/exports/Makefile @@ -142,10 +142,14 @@ ifneq (,$(filter 1 2,$(NOFORTRAN))) else ifeq ($(F_COMPILER), INTEL) $(FC) $(FFLAGS) $(LDFLAGS) -all-load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def +else +ifeq ($(F_COMPILER), FLANG) + $(FC) $(FFLAGS) $(LDFLAGS) -fno-fortran-main -Mnomain -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB) else $(FC) $(FFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB) endif endif +endif dllinit.$(SUFFIX) : dllinit.c $(CC) $(CFLAGS) -c -o $(@F) -s $<