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