1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set up EXTSTATIC before checking it

Browse Source 
The bundle_loader check for darwin checks EXTSTATIC, but previously the
setup for the variable comes after the check. I had trouble building
using --with-static-linked-ext on darwin before this change.
This commit is contained in:
Alan Wu 2022-11-10 11:30:54 -05:00 committed by GitHub
parent c726c48a3d
commit c771d83593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-11-10 16:31:19 +00:00 
Merged: https://github.com/ruby/ruby/pull/6675

Merged-By: XrXr
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure.ac
View File

@ -2964,6 +2964,23 @@ STATIC=
]) ])
} }
EXTSTATIC=
AC_SUBST(EXTSTATIC)dnl
AC_ARG_WITH(static-linked-ext,
AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
[AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
EXTOBJS='ext/extinit.$(OBJEXT)'
AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
AC_SUBST(ENCSTATIC, static)
], [
ENCOBJS='dmyenc.$(OBJEXT)'
EXTOBJS='dmyext.$(OBJEXT)'
])
AC_SUBST(ENCOBJS)
AC_SUBST(EXTOBJS)
: "rpath" && { : "rpath" && {
AS_CASE(["$target_os"], AS_CASE(["$target_os"],
[solaris*], [ AS_IF([test "$GCC" = yes], [ [solaris*], [ AS_IF([test "$GCC" = yes], [
@ -3268,23 +3285,6 @@ AC_ARG_WITH(ext,
AC_ARG_WITH(out-ext, AC_ARG_WITH(out-ext,
AS_HELP_STRING([--with-out-ext=EXTS], AS_HELP_STRING([--with-out-ext=EXTS],
[pass to --without-ext option of extmk.rb])) [pass to --without-ext option of extmk.rb]))
EXTSTATIC=
AC_SUBST(EXTSTATIC)dnl
AC_ARG_WITH(static-linked-ext,
AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
[AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
EXTOBJS='ext/extinit.$(OBJEXT)'
AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
AC_SUBST(ENCSTATIC, static)
], [
ENCOBJS='dmyenc.$(OBJEXT)'
EXTOBJS='dmyext.$(OBJEXT)'
])
AC_SUBST(ENCOBJS)
AC_SUBST(EXTOBJS)
AC_ARG_WITH(setup, AC_ARG_WITH(setup,
AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]), AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
[setup=$withval]) [setup=$withval])