Skip to content

Commit 6c17db1

Browse files
authored
Make ASAN build not be debug, following clangs recommendation (#54094)
1 parent 65f74bc commit 6c17db1

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

contrib/asan/Make.user.asan

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ override SANITIZE_ADDRESS=1
1717
# make the GC use regular malloc/frees, which are hooked by ASAN
1818
override WITH_GC_DEBUG_ENV=1
1919

20-
# default to a debug build for better line number reporting
21-
override JULIA_BUILD_MODE=debug
22-
2320
# Enable Julia assertions and LLVM assertions
2421
FORCE_ASSERTIONS=1
2522
LLVM_ASSERTIONS=1

sysimage.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ RELBUILDROOT := $(call rel_path,$(JULIAHOME)/base,$(BUILDROOT)/base)/ # <-- make
6363
$(build_private_libdir)/corecompiler.ji: $(COMPILER_SRCS)
6464
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
6565
$(call spawn,$(JULIA_EXECUTABLE)) -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-ji $(call cygpath_w,$@).tmp \
66-
--startup-file=no --warn-overwrite=yes -g$(BOOTSTRAP_DEBUG_LEVEL) -O0 compiler/compiler.jl)
66+
--startup-file=no --warn-overwrite=yes -g$(BOOTSTRAP_DEBUG_LEVEL) -O1 compiler/compiler.jl)
6767
@mv $@.tmp $@
6868

6969
$(build_private_libdir)/sys.ji: $(build_private_libdir)/corecompiler.ji $(JULIAHOME)/VERSION $(BASE_SRCS) $(STDLIB_SRCS)
7070
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
7171
if ! JULIA_BINDIR=$(call cygpath_w,$(build_bindir)) WINEPATH="$(call cygpath_w,$(build_bindir));$$WINEPATH" \
72-
$(call spawn, $(JULIA_EXECUTABLE)) -g1 -O0 -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-ji $(call cygpath_w,$@).tmp $(JULIA_SYSIMG_BUILD_FLAGS) \
72+
$(call spawn, $(JULIA_EXECUTABLE)) -g1 -O1 -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-ji $(call cygpath_w,$@).tmp $(JULIA_SYSIMG_BUILD_FLAGS) \
7373
--startup-file=no --warn-overwrite=yes --sysimage $(call cygpath_w,$<) sysimg.jl $(RELBUILDROOT); then \
7474
echo '*** This error might be fixed by running `make clean`. If the error persists$(COMMA) try `make cleanall`. ***'; \
7575
false; \

0 commit comments

Comments
 (0)