Skip to content

Commit

Permalink
[build] Fix out-of-tree stringreplace invocations (#39567)
Browse files Browse the repository at this point in the history
Because we now store these strings in `libjulia-internal`, we need to
call `stringreplace` on that library instead of `libjulia`.
  • Loading branch information
staticfloat authored Feb 8, 2021
1 parent 75b20b4 commit 4c5d62b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4c5d62b

Please sign in to comment.