Skip to content

Commit 77433af

Browse files
authored
Merge pull request #3532 from martin-frbg/issue3528-2
Fix building a shared library on Mac with flang-classic
2 parents dc80925 + db7a03d commit 77433af

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

exports/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,14 @@ ifneq (,$(filter 1 2,$(NOFORTRAN)))
142142
else
143143
ifeq ($(F_COMPILER), INTEL)
144144
$(FC) $(FFLAGS) $(LDFLAGS) -all-load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def
145+
else
146+
ifeq ($(F_COMPILER), FLANG)
147+
$(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)
145148
else
146149
$(FC) $(FFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
147150
endif
148151
endif
152+
endif
149153

150154
dllinit.$(SUFFIX) : dllinit.c
151155
$(CC) $(CFLAGS) -c -o $(@F) -s $<

f_check

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ if ($link ne "") {
361361
($flags =~ /^\-l/)
362362
&& ($flags !~ /ibrary/)
363363
&& ($flags !~ /gfortranbegin/)
364+
&& ($flags !~ /flangmain/)
364365
&& ($flags !~ /frtbegin/)
365366
&& ($flags !~ /pathfstart/)
366367
&& ($flags !~ /crt[0-9]/)

0 commit comments

Comments
 (0)