Skip to content

Commit

Permalink
Update libgfortran name matching to include SOVERSION (#30135)
Browse files Browse the repository at this point in the history 
This fixes the annoying re-copying of `libgfortran` every time on
machines that have an SOVERSIONed filename.
  • Loading branch information
@staticfloat
staticfloat authored Dec 1, 2018
1 parent 3dd678f commit d54f40d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ endef
# don't inadvertently link to /lib/libgcc_s.so.1, which is incompatible with
# libgfortran, and on Windows we copy them in earlier as well.
ifeq (,$(findstring $(OS),FreeBSD WINNT))
julia-base: $(build_libdir)/libgfortran.$(SHLIB_EXT)
$(build_libdir)/libgfortran.$(SHLIB_EXT): | $(build_libdir)
julia-base: $(build_libdir)/libgfortran*.$(SHLIB_EXT)*
$(build_libdir)/libgfortran*.$(SHLIB_EXT)*: | $(build_libdir) julia-deps
-$(CUSTOM_LD_LIBRARY_PATH) PATH=$(PATH):$(build_depsbindir) $(JULIAHOME)/contrib/fixup-libgfortran.sh --verbose $(build_libdir)
JL_PRIVATE_LIBS-0 += libgfortran libgcc_s libquadmath
endif
Expand Down

1 comment on commit d54f40d

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily benchmark build, I will reply here when finished:

@nanosoldier runbenchmarks(ALL, isdaily = true)

Please sign in to comment.