Skip to content

Commit a77ba79

Browse files
KenoKeno
authored
Revert "build: cleanup base files inclusion (#45441)" (#46420)
This reverts commit f0b1c5f.
1 parent beb3ab4 commit a77ba79

File tree

16 files changed

+116
-136
lines changed

16 files changed

+116
-136
lines changed

‎Makefile‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ default: $(JULIA_BUILD_MODE) # contains either "debug" or "release"
99
all: debug release
1010

1111
# sort is used to remove potential duplicates
12-
DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_private_libdir) $(build_libexecdir) $(build_includedir) $(build_includedir)/julia $(build_sysconfdir)/julia $(build_datarootdir)/julia $(build_datarootdir)/julia/src $(build_datarootdir)/julia/stdlib $(build_man1dir))
12+
DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_private_libdir) $(build_libexecdir) $(build_includedir) $(build_includedir)/julia $(build_sysconfdir)/julia $(build_datarootdir)/julia $(build_datarootdir)/julia/stdlib $(build_man1dir))
1313
ifneq ($(BUILDROOT),$(JULIAHOME))
1414
BUILDDIRS := $(BUILDROOT) $(addprefix $(BUILDROOT)/,base src src/flisp src/support src/clangsa cli doc deps stdlib test test/clangsa test/embedding test/llvmpasses)
1515
BUILDDIRMAKE := $(addsuffix /Makefile,$(BUILDDIRS)) $(BUILDROOT)/sysimage.mk
@@ -39,13 +39,13 @@ configure:
3939
endif
4040

4141
$(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
42-
$(eval $(call symlink_target,$(JULIAHOME)/test,$$(build_datarootdir)/julia,test))
42+
$(foreach link,base $(JULIAHOME)/test,$(eval $(call symlink_target,$(link),$$(build_datarootdir)/julia,$(notdir $(link)))))
4343

4444
julia_flisp.boot.inc.phony: julia-deps
4545
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/src julia_flisp.boot.inc.phony
4646

4747
# Build the HTML docs (skipped if already exists, notably in tarballs)
48-
$(BUILDROOT)/doc/_build/html/en/index.html: $(shell find $(BUILDROOT)/base $(BUILDROOT)/doc \( -path $(BUILDROOT)/doc/_build -o -path $(BUILDROOT)/doc/deps \) -prune -o -type f -print)
48+
$(BUILDROOT)/doc/_build/html/en/index.html: $(shell find $(BUILDROOT)/base $(BUILDROOT)/doc \( -path $(BUILDROOT)/doc/_build -o -path $(BUILDROOT)/doc/deps -o -name *_constants.jl -o -name *_h.jl -o -name version_git.jl \) -prune -o -type f -print)
4949
@$(MAKE) docs
5050

5151
julia-symlink: julia-cli-$(JULIA_BUILD_MODE)
@@ -58,7 +58,7 @@ ifndef JULIA_VAGRANT_BUILD
5858
endif
5959
endif
6060

61-
julia-deps: | $(DIRS) $(build_datarootdir)/julia/test
61+
julia-deps: | $(DIRS) $(build_datarootdir)/julia/base $(build_datarootdir)/julia/test
6262
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/deps
6363

6464
# `julia-stdlib` depends on `julia-deps` so that the fake JLL stdlibs can copy in their Artifacts.toml files.
@@ -86,14 +86,9 @@ julia-sysimg-ji : julia-stdlib julia-base julia-cli-$(JULIA_BUILD_MODE) julia-sr
8686
julia-sysimg-bc : julia-stdlib julia-base julia-cli-$(JULIA_BUILD_MODE) julia-src-$(JULIA_BUILD_MODE) | $(build_private_libdir)
8787
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) -f sysimage.mk sysimg-bc JULIA_EXECUTABLE='$(JULIA_EXECUTABLE)'
8888

89-
$(JULIA_SYSIMG_release): julia-sysimg-ji julia-src-release
90-
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) -f sysimage.mk sysimg-release
91-
$(JULIA_SYSIMG_debug) : julia-sysimg-ji julia-src-debug
92-
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) -f sysimage.mk sysimg-debug
89+
julia-sysimg-release julia-sysimg-debug : julia-sysimg-% : julia-sysimg-ji julia-src-%
90+
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) -f sysimage.mk sysimg-$*
9391

94-
julia-sysimg-release : $(JULIA_SYSIMG_release)
95-
julia-sysimg-debug : $(JULIA_SYSIMG_debug)
96-
julia-base-cache: $(build_datarootdir)/julia/base.cache
9792
julia-debug julia-release : julia-% : julia-sysimg-% julia-src-% julia-symlink julia-libccalltest julia-libllvmcalltest julia-base-cache
9893

9994
debug release : % : julia-%
@@ -163,10 +158,10 @@ $(build_datarootdir)/julia/julia-config.jl: $(JULIAHOME)/contrib/julia-config.jl
163158
$(build_depsbindir)/stringreplace: $(JULIAHOME)/contrib/stringreplace.c | $(build_depsbindir)
164159
@$(call PRINT_CC, $(HOSTCC) -o $(build_depsbindir)/stringreplace $(JULIAHOME)/contrib/stringreplace.c)
165160

166-
$(build_datarootdir)/julia/base.cache: $(JULIA_SYSIMG) | $(DIRS) $(build_datarootdir)/julia
161+
julia-base-cache: julia-sysimg-$(JULIA_BUILD_MODE) | $(DIRS) $(build_datarootdir)/julia
167162
@JULIA_BINDIR=$(call cygpath_w,$(build_bindir)) WINEPATH="$(call cygpath_w,$(build_bindir));$$WINEPATH" \
168163
$(call spawn, $(JULIA_EXECUTABLE) --startup-file=no $(call cygpath_w,$(JULIAHOME)/etc/write_base_cache.jl) \
169-
$(call cygpath_w,$@))
164+
$(call cygpath_w,$(build_datarootdir)/julia/base.cache))
170165

171166
# public libraries, that are installed in $(prefix)/lib
172167
ifeq ($(JULIA_BUILD_MODE),release)
@@ -319,9 +314,10 @@ else ifeq ($(JULIA_BUILD_MODE),debug)
319314
endif
320315

321316
# Copy in all .jl sources as well
322-
mkdir -p $(DESTDIR)$(datarootdir)/julia/src $(DESTDIR)$(datarootdir)/julia/test
323-
cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia
317+
mkdir -p $(DESTDIR)$(datarootdir)/julia/base $(DESTDIR)$(datarootdir)/julia/test
318+
cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base
324319
cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test
320+
cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia
325321
# Copy documentation
326322
cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
327323
# Remove various files which should not be installed
@@ -469,7 +465,7 @@ ifneq ($(BUILDROOT),$(JULIAHOME))
469465
$(error make light-source-dist does not work in out-of-tree builds)
470466
endif
471467
# Save git information
472-
-@$(MAKE) -C $(JULIAHOME)/base version_git.jl
468+
-@$(MAKE) -C $(JULIAHOME)/base version_git.jl.phony
473469

474470
# Create file light-source-dist.tmp to hold all the filenames that go into the tarball
475471
echo "base/version_git.jl" > light-source-dist.tmp

‎base/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
/features_h.jl
2+
/pcre_h.jl
3+
/errno_h.jl
4+
/build_h.jl
15
/build_h.jl.phony
6+
/file_constants.jl
7+
/uv_constants.jl
28
/version_git.jl
39
/version_git.jl.phony
410
/userimg.jl

‎base/Base.jl‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,18 @@ using .Iterators: Flatten, Filter, product # for generators
157157
include("namedtuple.jl")
158158

159159
# For OS specific stuff
160-
include("../build_h.jl")
161-
include("../version_git.jl")
160+
# We need to strcat things here, before strings are really defined
161+
function strcat(x::String, y::String)
162+
out = ccall(:jl_alloc_string, Ref{String}, (Csize_t,), Core.sizeof(x) + Core.sizeof(y))
163+
GC.@preserve x y out begin
164+
out_ptr = unsafe_convert(Ptr{UInt8}, out)
165+
unsafe_copyto!(out_ptr, unsafe_convert(Ptr{UInt8}, x), Core.sizeof(x))
166+
unsafe_copyto!(out_ptr + Core.sizeof(x), unsafe_convert(Ptr{UInt8}, y), Core.sizeof(y))
167+
end
168+
return out
169+
end
170+
include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "build_h.jl")) # include($BUILDROOT/base/build_h.jl)
171+
include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "version_git.jl")) # include($BUILDROOT/base/version_git.jl)
162172

163173
# These used to be in build_h.jl and are retained for backwards compatibility
164174
const libblas_name = "libblastrampoline"

‎base/Makefile‎

Lines changed: 26 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,7 @@ include $(JULIAHOME)/Make.inc
55

66
TAGGED_RELEASE_BANNER := ""
77

8-
all:
9-
10-
BASE_SRCS := $(patsubst ./%,%,$(shell cd $(SRCDIR) && find . -name \*.jl -and -not -name version_git.jl -and -not -name '*.phony'))
11-
GENERATED_SRCS := pcre_h.jl errno_h.jl build_h.jl.phony features_h.jl file_constants.jl uv_constants.jl version_git.jl.phony
12-
13-
GENERATED_DSTS := $(addprefix $(build_datarootdir)/julia/src/,$(GENERATED_SRCS))
14-
BASE_DSTS := $(addprefix $(build_datarootdir)/julia/src/base/,$(BASE_SRCS)) $(GENERATED_DSTS)
15-
BASE_DIRS := $(sort $(dir $(BASE_DSTS)))
16-
$(foreach dir,$(BASE_DIRS),$(eval $(call dir_target,$(dir))))
17-
18-
# we might like to add "| $(BASE_DIRS)" here, but that causes many version of 'make' to get confused and fail to build consistently
19-
$(build_datarootdir)/julia/src/base/%.jl: $(SRCDIR)/%.jl
20-
@mkdir -p $(dir $@)
21-
cp $< $@
22-
23-
all: $(BASE_DSTS)
8+
all: $(addprefix $(BUILDDIR)/,pcre_h.jl errno_h.jl build_h.jl.phony features_h.jl file_constants.jl uv_constants.jl version_git.jl.phony)
249

2510
PCRE_CONST := 0x[0-9a-fA-F]+|[0-9]+|\([\-0-9]+\)
2611
ifeq ($(USE_SYSTEM_PCRE), 1)
@@ -31,37 +16,29 @@ endif
3116

3217
define parse_features
3318
@echo "# $(2) features" >> $@
34-
@$(call PRINT_PERL, cat $(JULIAHOME)/src/features_$(1).h | \
35-
perl -lne 'print "const JL_$(2)_$$1 = UInt32($$2)" if /^\s*JL_FEATURE_DEF(?:_NAME)?\(\s*(\w+)\s*,\s*([^,]+)\s*,.*\)\s*(?:\/\/.*)?$$/' >> $@)
19+
@$(call PRINT_PERL, cat $(SRCDIR)/../src/features_$(1).h | perl -lne 'print "const JL_$(2)_$$1 = UInt32($$2)" if /^\s*JL_FEATURE_DEF(?:_NAME)?\(\s*(\w+)\s*,\s*([^,]+)\s*,.*\)\s*(?:\/\/.*)?$$/' >> $@)
3620
@echo >> $@
3721
endef
3822

39-
$(build_datarootdir)/julia/src/features_h.jl: $(JULIAHOME)/src/features_x86.h $(JULIAHOME)/src/features_aarch32.h $(JULIAHOME)/src/features_aarch64.h
40-
@mkdir -p $(dir $@)
23+
$(BUILDDIR)/features_h.jl: $(SRCDIR)/../src/features_x86.h $(SRCDIR)/../src/features_aarch32.h $(SRCDIR)/../src/features_aarch64.h
4124
@-rm -f $@
4225
@$(call parse_features,x86,X86)
4326
@$(call parse_features,aarch32,AArch32)
4427
@$(call parse_features,aarch64,AArch64)
4528

46-
$(build_datarootdir)/julia/src/pcre_h.jl: $(PCRE_INCL_PATH)
47-
@mkdir -p $(dir $@)
29+
$(BUILDDIR)/pcre_h.jl: $(PCRE_INCL_PATH)
4830
@$(call PRINT_PERL, $(CPP) -D PCRE2_CODE_UNIT_WIDTH=8 -dM $< | perl -nle '/^\s*#define\s+PCRE2_(\w*)\s*\(?($(PCRE_CONST))\)?u?\s*$$/ and print index($$1, "ERROR_") == 0 ? "const $$1 = Cint($$2)" : "const $$1 = UInt32($$2)"' | LC_ALL=C sort > $@)
4931

50-
$(build_datarootdir)/julia/src/errno_h.jl:
51-
@mkdir -p $(dir $@)
32+
$(BUILDDIR)/errno_h.jl:
5233
@$(call PRINT_PERL, echo '#include <errno.h>' | $(CPP) -dM - | perl -nle 'print "const $$1 = Int32($$2)" if /^#define\s+(E\w+)\s+(\d+)\s*$$/' | LC_ALL=C sort > $@)
5334

54-
$(build_datarootdir)/julia/src/file_constants.jl: $(JULIAHOME)/src/file_constants.h
55-
@mkdir -p $(dir $@)
35+
$(BUILDDIR)/file_constants.jl: $(SRCDIR)/../src/file_constants.h
5636
@$(call PRINT_PERL, $(CPP_STDOUT) -DJULIA $< | perl -nle 'print "$$1 0o$$2" if /^(\s*const\s+[A-z_]+\s+=)\s+(0[0-9]*)\s*$$/; print "$$1" if /^\s*(const\s+[A-z_]+\s+=\s+([1-9]|0x)[0-9A-z]*)\s*$$/' > $@)
5737

58-
$(build_datarootdir)/julia/src/uv_constants.jl: $(JULIAHOME)/src/uv_constants.h $(LIBUV_INC)/uv/errno.h
59-
@mkdir -p $(dir $@)
38+
$(BUILDDIR)/uv_constants.jl: $(SRCDIR)/../src/uv_constants.h $(LIBUV_INC)/uv/errno.h
6039
@$(call PRINT_PERL, $(CPP_STDOUT) "-I$(LIBUV_INC)" -DJULIA $< | tail -n 16 > $@)
6140

62-
$(build_datarootdir)/julia/src/build_h.jl.phony: $(BUILDDIR)/build_h.jl.phony
6341
$(BUILDDIR)/build_h.jl.phony:
64-
@mkdir -p $(build_datarootdir)/julia/src
6542
@echo "# This file is automatically generated in base/Makefile" > $@
6643
ifeq ($(XC_HOST),)
6744
@echo "const MACHINE = \"$(BUILD_MACHINE)\"" >> $@
@@ -109,44 +86,35 @@ endif
10986

11087
@# This to ensure that we always rebuild this file, but only when it is modified do we touch build_h.jl,
11188
@# ensuring we rebuild the system image as infrequently as possible
112-
@if ! cmp -s $@ $(build_datarootdir)/julia/src/build_h.jl; then \
89+
@if ! cmp -s $@ build_h.jl; then \
11390
$(call PRINT_PERL,) \
114-
mv $@ $(build_datarootdir)/julia/src/build_h.jl; \
91+
mv $@ build_h.jl; \
11592
else \
11693
rm -f $@; \
11794
fi
11895

119-
$(build_datarootdir)/julia/src/version_git.jl.phony: $(BUILDDIR)/version_git.jl.phony
12096
$(BUILDDIR)/version_git.jl.phony: $(SRCDIR)/version_git.sh
121-
@mkdir -p $(build_datarootdir)/julia/src
122-
ifneq ($(NO_GIT),1)
123-
@sh $< $(SRCDIR) > $@
124-
else ifeq ($(shell [ -f $(BUILDDIR)/version_git.jl ] && echo "true"), true)
125-
@# Give warning if boilerplate git is found here
126-
@if grep -q "Default output if git is not available" $(BUILDDIR)/version_git.jl; then \
127-
echo "WARNING: Using boilerplate git version info" >&2; \
128-
fi
129-
@cp $(BUILDDIR)/version_git.jl $@
130-
else ifeq ($(shell [ -f $(SRCDIR)/version_git.jl ] && echo "true"), true)
131-
@# Give warning if boilerplate git is found here
132-
@if grep -q "Default output if git is not available" $(SRCDIR)/version_git.jl; then \
133-
echo "WARNING: Using boilerplate git version info" >&2; \
134-
fi
135-
@cp $(SRCDIR)/version_git.jl $@
136-
else
137-
$(warning "WARNING: Generating boilerplate git version info")
138-
@sh $< $(SRCDIR) NO_GIT > $@
139-
endif
97+
ifneq ($(NO_GIT), 1)
98+
sh $< $(SRCDIR) > $@
14099
@# This to avoid touching version_git.jl when it is not modified,
141100
@# so that the system image does not need to be rebuilt.
142-
@if ! cmp -s $@ $(build_datarootdir)/julia/src/version_git.jl; then \
101+
@if ! cmp -s $@ version_git.jl; then \
143102
$(call PRINT_PERL,) \
144-
mv $@ $(build_datarootdir)/julia/src/version_git.jl; \
103+
mv $@ version_git.jl; \
145104
else \
146105
rm -f $@; \
147106
fi
148-
$(BUILDDIR)/version_git.jl: $(SRCDIR)/version_git.sh
149-
sh $< $(SRCDIR) > $@
107+
else
108+
ifeq ($(shell [ -f $(BUILDDIR)/version_git.jl ] && echo "true"), true)
109+
@# Give warning if boilerplate git is used
110+
@if grep -q "Default output if git is not available" $(BUILDDIR)/version_git.jl; then \
111+
echo "WARNING: Using boilerplate git version info" >&2; \
112+
fi
113+
else
114+
$(warning "WARNING: Generating boilerplate git version info")
115+
@sh $(SRCDIR)/version_git.sh $(SRCDIR) NO_GIT > $(BUILDDIR)/version_git.jl
116+
endif
117+
endif
150118

151119
ifeq (,$(filter $(OS), WINNT emscripten))
152120
# For any USE_SYSTEM_* libraries that will be dynamically loaded by libjulia,
@@ -194,7 +162,7 @@ endif
194162
define symlink_system_library
195163
libname_$2 := $$(notdir $(call versioned_libname,$2,$3))
196164
libpath_$2 := $$(shell $$(call spawn,$$(LIBWHICH)) -p $$(libname_$2) 2>/dev/null)
197-
symlink_$2: $$(build_private_libdir)/$$(libname_$2) .FORCE
165+
symlink_$2: $$(build_private_libdir)/$$(libname_$2)
198166
$$(build_private_libdir)/$$(libname_$2):
199167
@if [ -e "$$(libpath_$2)" ]; then \
200168
REALPATH=$$(libpath_$2); \
@@ -300,10 +268,7 @@ endif
300268

301269
symlink_system_libraries: $(SYMLINK_SYSTEM_LIBRARIES)
302270

303-
.FORCE:
304-
.PHONY: $(BUILDDIR)/version_git.jl $(BUILDDIR)/version_git.jl.phony $(build_datarootdir)/julia/src/version_git.jl.phony \
305-
$(BUILDDIR)/build_h.jl.phony $(build_datarootdir)/julia/src/build_h.jl.phony \
306-
clean all .FORCE
271+
.PHONY: $(BUILDDIR)/build_h.jl.phony $(BUILDDIR)/version_git.jl.phony clean all symlink_*
307272

308273
clean:
309274
-rm -f $(BUILDDIR)/pcre_h.jl
@@ -315,5 +280,4 @@ clean:
315280
-rm -f $(BUILDDIR)/file_constants.jl
316281
-rm -f $(BUILDDIR)/version_git.jl
317282
-rm -f $(BUILDDIR)/version_git.jl.phony
318-
-rm -rf $(build_datarootdir)/julia/src/*
319283
-rm -f $(build_private_libdir)/lib*.$(SHLIB_EXT)*

‎base/cpuid.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Base.:<=(a::ISA, b::ISA) = a.features <= b.features
2121
Base.:<(a::ISA, b::ISA) = a.features < b.features
2222
Base.isless(a::ISA, b::ISA) = a < b
2323

24-
include("../features_h.jl")
24+
include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "features_h.jl")) # include($BUILDROOT/base/features_h.jl)
2525

2626
# Keep in sync with `arch_march_isa_mapping`.
2727
const ISAs_by_family = Dict(

‎base/filesystem.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ uv_fs_req_cleanup(req) = ccall(:uv_fs_req_cleanup, Cvoid, (Ptr{Cvoid},), req)
9090
include("path.jl")
9191
include("stat.jl")
9292
include("file.jl")
93-
include("../file_constants.jl")
93+
include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "file_constants.jl")) # include($BUILDROOT/base/file_constants.jl)
9494

9595
## Operations with File (fd) objects ##
9696

‎base/initdefs.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ function append_default_depot_path!(DEPOT_PATH)
9393
path in DEPOT_PATH || push!(DEPOT_PATH, path)
9494
path = abspath(Sys.BINDIR, "..", "share", "julia")
9595
path in DEPOT_PATH || push!(DEPOT_PATH, path)
96-
return DEPOT_PATH
9796
end
9897

9998
function init_depot_path()
@@ -112,7 +111,6 @@ function init_depot_path()
112111
else
113112
append_default_depot_path!(DEPOT_PATH)
114113
end
115-
nothing
116114
end
117115

118116
## LOAD_PATH & ACTIVE_PROJECT ##
@@ -222,7 +220,9 @@ function parse_load_path(str::String)
222220
end
223221

224222
function init_load_path()
225-
if haskey(ENV, "JULIA_LOAD_PATH")
223+
if Base.creating_sysimg
224+
paths = ["@stdlib"]
225+
elseif haskey(ENV, "JULIA_LOAD_PATH")
226226
paths = parse_load_path(ENV["JULIA_LOAD_PATH"])
227227
else
228228
paths = filter!(env -> env !== nothing,

‎base/libc.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if Sys.iswindows()
1414
export GetLastError, FormatMessage
1515
end
1616

17-
include("../errno_h.jl")
17+
include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "errno_h.jl")) # include($BUILDROOT/base/errno_h.jl)
1818

1919
## RawFD ##
2020

‎base/libuv.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Core definitions for interacting with the libuv library from Julia
44

5-
include("../uv_constants.jl")
5+
include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "uv_constants.jl")) # include($BUILDROOT/base/uv_constants.jl)
66

77
# convert UV handle data to julia object, checking for null
88
function uv_sizeof_handle(handle)

‎base/loading.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ elseif Sys.isapple()
4242
# char filename[max_filename_length];
4343
# };
4444
# Buffer buf;
45-
# getattrlist(path, &attr_list, &buf, sizeof(buf), FSOPT_NOFOLLOW);
45+
# getattrpath(path, &attr_list, &buf, sizeof(buf), FSOPT_NOFOLLOW);
4646
function isfile_casesensitive(path)
4747
isaccessiblefile(path) || return false
4848
path_basename = String(basename(path))
@@ -813,7 +813,7 @@ end
813813

814814
function find_source_file(path::AbstractString)
815815
(isabspath(path) || isfile(path)) && return path
816-
base_path = joinpath(Sys.BINDIR, DATAROOTDIR, "julia", "src", "base", path)
816+
base_path = joinpath(Sys.BINDIR, DATAROOTDIR, "julia", "base", path)
817817
return isfile(base_path) ? normpath(base_path) : nothing
818818
end
819819

0 commit comments

Comments
 (0)