diff --git a/Makefile.in b/Makefile.in index 69f96d0e2a..65af802038 100644 --- a/Makefile.in +++ b/Makefile.in @@ -85,6 +85,7 @@ MJIT_OPTFLAGS = @MJIT_OPTFLAGS@ MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@ MJIT_LDSHARED = @MJIT_LDSHARED@ MJIT_DLDFLAGS = @DLDFLAGS@ +MJIT_DLDFLAGS_NOCOMPRESS = @MJIT_DLDFLAGS_NOCOMPRESS@ MJIT_HEADER = rb_mjit_header.h MJIT_MIN_HEADER_NAME = rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/$(MJIT_MIN_HEADER_NAME) @@ -612,6 +613,7 @@ mjit_config.h: quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ quote "MJIT_DLDFLAGS $${need_mjit_archflag:+ MJIT_ARCHFLAG}" $(MJIT_DLDFLAGS); \ + quote "MJIT_DLDFLAGS_NOCOMPRESS " $(MJIT_DLDFLAGS_NOCOMPRESS); \ quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ $${archs:+echo} $${archs:+'#if 0'}; \ for arch in $$archs; do \ diff --git a/configure.ac b/configure.ac index a101b2110e..8db1c90701 100644 --- a/configure.ac +++ b/configure.ac @@ -543,6 +543,7 @@ AS_IF([test "$GCC" = yes], [ ]) AS_IF([test "x$compress_debug_sections" != xno], [ RUBY_APPEND_OPTION(DLDFLAGS, ${linker_flag}--compress-debug-sections=$compress_debug_sections) + RUBY_APPEND_OPTION(MJIT_DLDFLAGS_NOCOMPRESS, ${linker_flag}--compress-debug-sections=no) ]) AS_CASE(["$target_os"],[mingw*], [ @@ -2470,6 +2471,7 @@ AC_SUBST(MJIT_CC, [${MJIT_CC-'$(CC)'}])dnl AC_SUBST(MJIT_OPTFLAGS, [${MJIT_OPTFLAGS-'$(optflags)'}])dnl AC_SUBST(MJIT_DEBUGFLAGS, [${MJIT_DEBUGFLAGS-'$(debugflags)'}])dnl AC_SUBST(MJIT_LDSHARED)dnl +AC_SUBST(MJIT_DLDFLAGS_NOCOMPRESS)dnl AC_SUBST(STATIC)dnl AC_SUBST(CCDLFLAGS)dnl diff --git a/mjit_worker.c b/mjit_worker.c index 6a550e741a..5fa73ce54b 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -266,7 +266,7 @@ static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS NULL} static const char *const CC_DLDFLAGS_ARGS[] = { MJIT_DLDFLAGS #ifdef USE_ELF /* force disable compression to get line number on addr2line.c */ - "-Wl,--compress-debug-sections=none", + MJIT_DLDFLAGS_NOCOMPRESS #endif #if defined __GNUC__ && !defined __clang__ "-nostartfiles",