Skip to content

Commit bf7e52b

Browse files
authored
Fix removal of GPL libs (#60100)
`$(build_datarootdir)/lib/julia` doesn't exist, libraries are in `$(build_private_libdir)`. See https://github.com/JuliaLang/julia/pull/59627/files#r2510807584.
1 parent 4c8bca6 commit bf7e52b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

stdlib/Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ include $(JULIAHOME)/deps/*.version
1515

1616
VERSDIR := v$(shell cut -d. -f1-2 < $(JULIAHOME)/VERSION)
1717
DIRS := $(build_datarootdir)/julia/stdlib/$(VERSDIR) $(build_prefix)/manifest/$(VERSDIR)
18-
LIBDIR := $(build_datarootdir)/lib/julia
1918

2019
$(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
2120

@@ -65,11 +64,11 @@ STDLIBS_LINK_TARGETS := $(addprefix $(build_datarootdir)/julia/stdlib/$(VERSDIR)
6564
remove-gpl-libs:
6665
ifeq ($(USE_GPL_LIBS),0)
6766
@echo Removing GPL libs...
68-
-rm -f $(LIBDIR)/libcholmod*
69-
-rm -f $(LIBDIR)/libklu_cholmod*
70-
-rm -f $(LIBDIR)/librbio*
71-
-rm -f $(LIBDIR)/libspqr*
72-
-rm -f $(LIBDIR)/libumfpack*
67+
-rm -f $(build_private_libdir)/libcholmod*
68+
-rm -f $(build_private_libdir)/libklu_cholmod*
69+
-rm -f $(build_private_libdir)/librbio*
70+
-rm -f $(build_private_libdir)/libspqr*
71+
-rm -f $(build_private_libdir)/libumfpack*
7372
endif
7473

7574
getall get: $(addprefix get-, $(STDLIBS_EXT) $(JLL_NAMES))

0 commit comments

Comments
 (0)