Skip to content

Commit 97f62a9

Browse files
committed
makefile fixes: close #12178
1 parent d45e430 commit 97f62a9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif
4848
julia-deps: | $(DIRS) $(build_datarootdir)/julia/base $(build_datarootdir)/julia/test $(build_docdir) $(build_sysconfdir)/julia/juliarc.jl $(build_man1dir)/julia.1
4949
@$(MAKE) $(QUIET_MAKE) -C deps
5050

51-
julia-base: julia-deps
51+
julia-base: julia-deps $(build_docdir)/helpdb.jl
5252
@$(MAKE) $(QUIET_MAKE) -C base
5353

5454
julia-libccalltest:
@@ -273,6 +273,9 @@ $(eval $(call std_dll,gcc_s_seh-1))
273273
endif
274274
$(eval $(call std_dll,ssp-0))
275275
endif
276+
define stringreplace
277+
$(build_bindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
278+
endef
276279

277280
install: $(build_bindir)/stringreplace doc/_build/html
278281
@$(MAKE) $(QUIET_MAKE) all
@@ -368,9 +371,6 @@ else ifeq ($(OS), Linux)
368371
endif
369372

370373
# Overwrite JL_SYSTEM_IMAGE_PATH in julia library
371-
define stringreplace
372-
$(build_bindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
373-
endef
374374
$(call stringreplace,$(DESTDIR)$(private_libdir)/libjulia.$(SHLIB_EXT),sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT))
375375
$(call stringreplace,$(DESTDIR)$(private_libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
376376
endif

0 commit comments

Comments
 (0)