Skip to content

Commit e0f9045

Browse files
staticfloatfredrikekre
authored andcommitted
Move 7z installation out of non-Windows if statement (#33505)
1 parent a68237f commit e0f9045

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,6 @@ endif
298298
-$(INSTALL_M) $(build_bindir)/libopenlibm.dll.a $(DESTDIR)$(libdir)/
299299
else
300300

301-
# Install `7z` into libexec/
302-
$(INSTALL_M) $(build_bindir)/7z$(EXE) $(DESTDIR)$(libexecdir)/
303-
304301
# Copy over .dSYM directories directly for Darwin
305302
ifneq ($(DARWIN_FRAMEWORK),1)
306303
ifeq ($(OS),Darwin)
@@ -330,6 +327,7 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
330327
@$(DSYMUTIL) -o $(DESTDIR)$(prefix)/$(framework_resources)/sys-debug.dylib.dSYM $(build_private_libdir)/sys-debug.dylib
331328
endif
332329
endif
330+
333331
for suffix in $(JL_PRIVATE_LIBS-0) ; do \
334332
for lib in $(build_libdir)/$${suffix}.*$(SHLIB_EXT)*; do \
335333
if [ "$${lib##*.}" != "dSYM" ]; then \
@@ -342,6 +340,8 @@ endif
342340
$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
343341
done
344342
endif
343+
# Install `7z` into libexec/
344+
$(INSTALL_M) $(build_bindir)/7z$(EXE) $(DESTDIR)$(libexecdir)/
345345

346346
# Copy public headers
347347
cp -R -L $(build_includedir)/julia/* $(DESTDIR)$(includedir)/julia

0 commit comments

Comments
 (0)