Skip to content

Commit c651aa5

Browse files
committed
[build] Fix out-of-tree stringreplace invocations (#39567)
Because we now store these strings in `libjulia-internal`, we need to call `stringreplace` on that library instead of `libjulia`. (cherry picked from commit 4c5d62b)
1 parent f897f5e commit c651aa5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,16 @@ else ifneq (,$(findstring $(OS),Linux FreeBSD))
344344
done
345345
endif
346346

347-
# Overwrite JL_SYSTEM_IMAGE_PATH in julia library
348-
if [ $(DARWIN_FRAMEWORK) = 0 ]; then \
349-
RELEASE_TARGET=$(DESTDIR)$(libdir)/libjulia.$(SHLIB_EXT); \
350-
DEBUG_TARGET=$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT); \
347+
# Overwrite JL_SYSTEM_IMAGE_PATH in libjulia-internal
348+
if [ "$(DARWIN_FRAMEWORK)" = "0" ]; then \
349+
RELEASE_TARGET=$(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT); \
350+
DEBUG_TARGET=$(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT); \
351351
else \
352352
RELEASE_TARGET=$(DESTDIR)$(prefix)/$(framework_dylib); \
353353
DEBUG_TARGET=$(DESTDIR)$(prefix)/$(framework_dylib)_debug; \
354354
fi; \
355355
$(call stringreplace,$${RELEASE_TARGET},sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT)); \
356-
if [ $(BUNDLE_DEBUG_LIBS) = 1 ]; then \
356+
if [ "$(BUNDLE_DEBUG_LIBS)" = "1" ]; then \
357357
$(call stringreplace,$${DEBUG_TARGET},sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT)); \
358358
fi;
359359
endif

0 commit comments

Comments
 (0)