Skip to content

Commit 8615732

Browse files
Kenotkelman
authored andcommitted
Set an RPATH on all libraries requiring fortran in binary-dist (#17901)
1 parent cbb1b96 commit 8615732

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ endif
453453
@$(MAKE) -C $(BUILDROOT) -f $(JULIAHOME)/Makefile install
454454
cp $(JULIAHOME)/LICENSE.md $(BUILDROOT)/julia-$(JULIA_COMMIT)
455455
ifneq ($(OS), WINNT)
456-
-$(JULIAHOME)/contrib/fixup-libgfortran.sh $(DESTDIR)$(private_libdir)
456+
-$(CUSTOM_LD_LIBRARY_PATH) PATH=$(PATH):$(build_depsbindir) $(JULIAHOME)/contrib/fixup-libgfortran.sh $(DESTDIR)$(private_libdir)
457457
endif
458458
ifeq ($(OS), Linux)
459459
-$(JULIAHOME)/contrib/fixup-libstdc++.sh $(DESTDIR)$(libdir) $(DESTDIR)$(private_libdir)

contrib/fixup-libgfortran.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,12 @@ if [ "$UNAME" = "Darwin" ]; then
9393
done
9494
done
9595
fi
96+
97+
if [ "$UNAME" = "Linux" ]; then
98+
cd $private_libdir
99+
for file in openlibm quadmath gfortran openblas arpack lapack openspecfun; do
100+
for dylib in $(ls lib$file*.so* 2>/dev/null); do
101+
patchelf --set-rpath \$ORIGIN $dylib
102+
done
103+
done
104+
fi

0 commit comments

Comments
 (0)