From 68929b7e1b6de46f70e0c62f34b2f1d636deadd1 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Mon, 8 Feb 2021 17:22:01 +0000 Subject: [PATCH] [build] Fix out-of-tree `stringreplace` invocations Because we now store these strings in `libjulia-internal`, we need to call `stringreplace` on that library instead of `libjulia`. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c5dad6afd9..2d7f556dfe 100644 --- a/Makefile +++ b/Makefile @@ -347,16 +347,16 @@ else ifneq (,$(findstring $(OS),Linux FreeBSD)) done endif - # Overwrite JL_SYSTEM_IMAGE_PATH in julia library - if [ $(DARWIN_FRAMEWORK) = 0 ]; then \ - RELEASE_TARGET=$(DESTDIR)$(libdir)/libjulia.$(SHLIB_EXT); \ - DEBUG_TARGET=$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT); \ + # Overwrite JL_SYSTEM_IMAGE_PATH in libjulia-internal + if [ "$(DARWIN_FRAMEWORK)" = "0" ]; then \ + RELEASE_TARGET=$(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT); \ + DEBUG_TARGET=$(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT); \ else \ RELEASE_TARGET=$(DESTDIR)$(prefix)/$(framework_dylib); \ DEBUG_TARGET=$(DESTDIR)$(prefix)/$(framework_dylib)_debug; \ fi; \ $(call stringreplace,$${RELEASE_TARGET},sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT)); \ - if [ $(BUNDLE_DEBUG_LIBS) = 1 ]; then \ + if [ "$(BUNDLE_DEBUG_LIBS)" = "1" ]; then \ $(call stringreplace,$${DEBUG_TARGET},sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT)); \ fi; endif -- 2.26.2