Introduce BUNDLE_DEBUG_LIBS to control whether debug libs are include…

…d in the binaries (JuliaLang#27814)

By default, avoid including sys-debug.so and libjulia-debug.so in the generated binaries.
Don't test julia-debug in CI, since we do not install it.

.circleci/config.yml

@@ -55,7 +55,7 @@ jobs:
  mv project julia-src &&
  /tmp/julia/bin/julia -e 'Base.require(Main, :InteractiveUtils).versioninfo()' &&
  /tmp/julia/bin/julia --sysimage-native-code=no -e 'true' &&
- /tmp/julia/bin/julia-debug --sysimage-native-code=no -e 'true' &&
+ #/tmp/julia/bin/julia-debug --sysimage-native-code=no -e 'true' &&
  pushd /tmp/julia/share/julia/test &&
  if [ $(echo "$FILES_CHANGED" | grep -cv '^doc/') -gt 0 ]; then
  /tmp/julia/bin/julia --check-bounds=yes runtests.jl all --skip Sockets | bar -i 30 &&

.travis.yml

@@ -127,8 +127,8 @@ script:
  - FILES_CHANGED=$(git diff --name-only $TRAVIS_COMMIT_RANGE -- || git ls-files)
  - cd .. && mv julia julia2
  # run tests
- - /tmp/julia/bin/julia --sysimage-native-code=no -e 'true' &&
-   /tmp/julia/bin/julia-debug --sysimage-native-code=no -e 'true'
+ - /tmp/julia/bin/julia --sysimage-native-code=no -e 'true'
+ # - /tmp/julia/bin/julia-debug --sysimage-native-code=no -e 'true'
  - /tmp/julia/bin/julia -e 'Base.require(Main, :InteractiveUtils).versioninfo()'
  - pushd /tmp/julia/share/julia/test
  # skip tests if only files within the "doc" dir have changed

Makefile

@@ -225,7 +225,10 @@ julia-base-cache: julia-sysimg-$(JULIA_BUILD_MODE) | $(DIRS) $(build_datarootdir
  $(call cygpath_w,$(build_datarootdir)/julia/base.cache))
 
 # public libraries, that are installed in $(prefix)/lib
-JL_LIBS := julia julia-debug
+JL_TARGETS := julia
+ifeq ($(BUNDLE_DEBUG_LIBS),1)
+JL_TARGETS += julia-debug
+endif
 
 # private libraries, that are installed in $(prefix)/lib/julia
 JL_PRIVATE_LIBS-0 := libccalltest
@@ -242,7 +245,7 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509
 JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2
 ifeq ($(USE_LLVM_SHLIB),1)
-JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM
+JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM libLLVM-6
 endif
 
 ifeq ($(USE_SYSTEM_OPENLIBM),0)
@@ -289,7 +292,7 @@ $$(build_bindir)/lib$(1).dll: | $$(build_bindir)
  cp $$(call pathsearch,lib$(1).dll,$$(STD_LIB_PATH)) $$(build_bindir)
 $$(build_depsbindir)/lib$(1).dll: | $$(build_depsbindir)
  cp $$(call pathsearch,lib$(1).dll,$$(STD_LIB_PATH)) $$(build_depsbindir)
-JL_LIBS += $(1)
+JL_TARGETS += $(1)
 endef
 
 # Given a list of space-separated libraries, return the first library name that is
@@ -320,28 +323,38 @@ install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index
  mkdir -p $(DESTDIR)$$subdir; \
  done
 
- $(INSTALL_M) $(build_bindir)/julia* $(DESTDIR)$(bindir)/
+ $(INSTALL_M) $(build_bindir)/julia $(DESTDIR)$(bindir)/
+ifeq ($(BUNDLE_DEBUG_LIBS),1)
+ $(INSTALL_M) $(build_bindir)/julia-debug $(DESTDIR)$(bindir)/
+endif
 ifeq ($(OS),WINNT)
  -$(INSTALL_M) $(build_bindir)/*.dll $(DESTDIR)$(bindir)/
  -$(INSTALL_M) $(build_libdir)/libjulia.dll.a $(DESTDIR)$(libdir)/
+ifeq ($(BUNDLE_DEBUG_LIBS),1)
  -$(INSTALL_M) $(build_libdir)/libjulia-debug.dll.a $(DESTDIR)$(libdir)/
+endif
  -$(INSTALL_M) $(build_bindir)/libopenlibm.dll.a $(DESTDIR)$(libdir)/
 else
+
+# Copy over .dSYM directories directly for Darwin
 ifeq ($(OS),Darwin)
- # Copy over .dSYM directories directly
- -cp -a $(build_libdir)/*.dSYM $(DESTDIR)$(libdir)
- -cp -a $(build_private_libdir)/*.dSYM $(DESTDIR)$(private_libdir)
+ -cp -a $(build_libdir)/libjulia.*.dSYM $(DESTDIR)$(libdir)
+ -cp -a $(build_private_libdir)/sys.dylib.dSYM $(DESTDIR)$(private_libdir)
+ifeq ($(BUNDLE_DEBUG_LIBS),1)
+ -cp -a $(build_libdir)/libjulia-debug.*.dSYM $(DESTDIR)$(libdir)
+ -cp -a $(build_private_libdir)/sys-debug.dylib.dSYM $(DESTDIR)$(private_libdir)
+endif
 endif
 
- for suffix in $(JL_LIBS) ; do \
- for lib in $(build_libdir)/lib$${suffix}*.$(SHLIB_EXT)*; do \
+ for suffix in $(JL_TARGETS) ; do \
+ for lib in $(build_libdir)/lib$${suffix}.*$(SHLIB_EXT)*; do \
  if [ "$${lib##*.}" != "dSYM" ]; then \
  $(INSTALL_M) $$lib $(DESTDIR)$(libdir) ; \
  fi \
  done \
  done
  for suffix in $(JL_PRIVATE_LIBS-0) ; do \
- for lib in $(build_libdir)/$${suffix}*.$(SHLIB_EXT)*; do \
+ for lib in $(build_libdir)/$${suffix}.*$(SHLIB_EXT)*; do \
  if [ "$${lib##*.}" != "dSYM" ]; then \
  $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
  fi \
@@ -357,7 +370,9 @@ endif
  cp -R -L $(build_includedir)/julia/* $(DESTDIR)$(includedir)/julia
  # Copy system image
  $(INSTALL_M) $(build_private_libdir)/sys.$(SHLIB_EXT) $(DESTDIR)$(private_libdir)
+ifeq ($(BUNDLE_DEBUG_LIBS),1)
  $(INSTALL_M) $(build_private_libdir)/sys-debug.$(SHLIB_EXT) $(DESTDIR)$(private_libdir)
+endif
  # Copy in system image build script
  $(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
  # Copy in all .jl sources as well
@@ -383,21 +398,23 @@ endif
  # Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)
 ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
 ifeq ($(OS), Darwin)
- for julia in $(DESTDIR)$(bindir)/julia* ; do \
- install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \
- install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \
+ for j in $(JL_TARGETS) ; do \
+ install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $(DESTDIR)$(bindir)/$$j; \
+ install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \
  done
 else ifneq (,$(findstring $(OS),Linux FreeBSD))
- for julia in $(DESTDIR)$(bindir)/julia* ; do \
- patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
+ for j in $(JL_TARGETS) ; do \
+ patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \
  done
 endif
 
  # Overwrite JL_SYSTEM_IMAGE_PATH in julia library
  $(call stringreplace,$(DESTDIR)$(libdir)/libjulia.$(SHLIB_EXT),sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT))
+ifeq ($(BUNDLE_DEBUG_LIBS),1)
  $(call stringreplace,$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
 endif
 
+endif
  # On FreeBSD, remove the build's libdir from each library's RPATH
 ifeq ($(OS),FreeBSD)
  $(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(libdir) $(build_libdir)

test/cmdlineargs.jl

@@ -499,9 +499,8 @@ end
 
 # backtrace contains type and line number info (esp. on windows #17179)
 for precomp in ("yes", "no")
- success, out, bt = readchomperrors(`$(Base.julia_cmd()) --startup-file=no --sysimage-native-code=$precomp
- -E 'include("____nonexistent_file")'`)
- @test !success
+ succ, out, bt = readchomperrors(`$(Base.julia_cmd()) --startup-file=no --sysimage-native-code=$precomp -E 'include("____nonexistent_file")'`)
+ @test !succ
  @test out == ""
  @test occursin("include_relative(::Module, ::String) at $(joinpath(".", "loading.jl"))", bt)
  lno = match(r"at \.[\/\\]loading\.jl:(\d+)", bt)