mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
configure.in: use single quotes
* configure.in (LD): enclose with single qoutes but not double quotes not to expand command substitution. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3fa3f9abb9
commit
4407beaef9
2 changed files with 22 additions and 17 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,8 @@
|
|||
Wed May 16 15:15:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (LD): enclose with single qoutes but not double quotes
|
||||
not to expand command substitution.
|
||||
|
||||
Wed May 16 14:19:51 2012 Yuki Yugui Sonoda <yugui@google.com>
|
||||
|
||||
Supports static linking of extensions and encodings again.
|
||||
|
@ -11,7 +16,7 @@ Wed May 16 14:19:51 2012 Yuki Yugui Sonoda <yugui@google.com>
|
|||
|
||||
* common.mk: Builds static libraries rather than shared objects if
|
||||
specified.
|
||||
|
||||
|
||||
* configure.in (LD): new substitution.
|
||||
|
||||
* enc/depend: Supports static linked libraries
|
||||
|
@ -19,10 +24,10 @@ Wed May 16 14:19:51 2012 Yuki Yugui Sonoda <yugui@google.com>
|
|||
|
||||
* enc/encinit.c.erb: new template to generate the initialization of
|
||||
statically linked encodings.
|
||||
|
||||
|
||||
* enc/make_encmake.rb (--module): new flag to specify whether static
|
||||
or dynamic.
|
||||
|
||||
|
||||
* transcode_data.h (TRANS_INIT): New macro to get rid of the name
|
||||
collision of encoding initializers and transcoder initializers.
|
||||
|
||||
|
|
28
configure.in
28
configure.in
|
@ -2097,7 +2097,7 @@ if test "$with_dln_a_out" != yes; then
|
|||
|
||||
AS_CASE(["$target_os"],
|
||||
[hpux*], [ DLDFLAGS="$DLDFLAGS -E"
|
||||
: ${LDSHARED="$(LD) -b"}
|
||||
: ${LDSHARED='$(LD) -b'}
|
||||
XLDFLAGS="$XLDFLAGS -Wl,-E"
|
||||
: ${LIBPATHENV=SHLIB_PATH}
|
||||
if test "$rb_cv_prog_gnu_ld" = no; then
|
||||
|
@ -2116,17 +2116,17 @@ if test "$with_dln_a_out" != yes; then
|
|||
: ${LIBPATHENV=LD_LIBRARY_PATH_64}
|
||||
fi
|
||||
rb_cv_dlopen=yes],
|
||||
[sunos*], [ : ${LDSHARED="$(LD) -assert nodefinitions"}
|
||||
[sunos*], [ : ${LDSHARED='$(LD) -assert nodefinitions'}
|
||||
rb_cv_dlopen=yes],
|
||||
[irix*], [ : ${LDSHARED="$(LD) -shared"}
|
||||
[irix*], [ : ${LDSHARED='$(LD) -shared'}
|
||||
rb_cv_dlopen=yes],
|
||||
[sysv4*], [ : ${LDSHARED="$(LD) -G"}
|
||||
[sysv4*], [ : ${LDSHARED='$(LD) -G'}
|
||||
rb_cv_dlopen=yes],
|
||||
[nto-qnx*], [ : ${LDSHARED='$(CC) -shared'}
|
||||
rb_cv_dlopen=yes],
|
||||
[esix*|uxpds*], [ : ${LDSHARED="$(LD) -G"}
|
||||
[esix*|uxpds*], [ : ${LDSHARED='$(LD) -G'}
|
||||
rb_cv_dlopen=yes],
|
||||
[osf*], [ : ${LDSHARED="$(LD) -shared -expect_unresolved \"*\""}
|
||||
[osf*], [ : ${LDSHARED='$(LD) -shared -expect_unresolved \'*\""}
|
||||
rb_cv_dlopen=yes],
|
||||
[bsdi3*], [ AS_CASE(["$CC"],
|
||||
[*shlicc*], [ : ${LDSHARED='$(CC) -r'}
|
||||
|
@ -2147,7 +2147,7 @@ if test "$with_dln_a_out" != yes; then
|
|||
LDFLAGS="$LDFLAGS -rdynamic"
|
||||
DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
|
||||
else
|
||||
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="$(LD) -Bshareable"
|
||||
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
|
||||
fi
|
||||
rb_cv_dlopen=yes],
|
||||
[openbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
|
||||
|
@ -2181,12 +2181,12 @@ if test "$with_dln_a_out" != yes; then
|
|||
rb_cv_dlopen=yes],
|
||||
[beos*], [ AS_CASE(["$target_cpu"],
|
||||
[powerpc*], [
|
||||
: ${LDSHARED="$(LD) -xms"}
|
||||
: ${LDSHARED='$(LD) -xms'}
|
||||
DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
|
||||
LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
|
||||
],
|
||||
[i586*], [
|
||||
: ${LDSHARED="$(LD) -shared"}
|
||||
: ${LDSHARED='$(LD) -shared'}
|
||||
DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
|
||||
LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
|
||||
])
|
||||
|
@ -2194,17 +2194,17 @@ if test "$with_dln_a_out" != yes; then
|
|||
rb_cv_dlopen=yes],
|
||||
[haiku*], [ AS_CASE(["$target_cpu"],
|
||||
[powerpc*], [
|
||||
: ${LDSHARED="$(LD) -xms"}
|
||||
: ${LDSHARED='$(LD) -xms'}
|
||||
DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
|
||||
],
|
||||
[i586*], [
|
||||
: ${LDSHARED="$(LD) -shared"}
|
||||
: ${LDSHARED='$(LD) -shared'}
|
||||
DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
|
||||
])
|
||||
: ${LIBPATHENV=LIBRARY_PATH}
|
||||
rb_cv_dlopen=yes ],
|
||||
[nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
|
||||
: ${LDSHARED="$(LD) -Bshareable -x"}
|
||||
: ${LDSHARED='$(LD) -Bshareable -x'}
|
||||
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
|
||||
rb_cv_dlopen=yes],
|
||||
[cygwin*|mingw*], [
|
||||
|
@ -2213,12 +2213,12 @@ if test "$with_dln_a_out" != yes; then
|
|||
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
|
||||
: ${LIBPATHENV=""}
|
||||
rb_cv_dlopen=yes],
|
||||
[hiuxmpp], [ : ${LDSHARED="$(LD) -r"}],
|
||||
[hiuxmpp], [ : ${LDSHARED='$(LD) -r'}],
|
||||
[atheos*], [ : ${LDSHARED='$(CC) -shared'}
|
||||
rb_cv_dlopen=yes],
|
||||
[os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf"
|
||||
],
|
||||
[ : ${LDSHARED="$(LD)"}])
|
||||
[ : ${LDSHARED='$(LD)'}])
|
||||
AC_MSG_RESULT($rb_cv_dlopen)
|
||||
fi
|
||||
if test "${LDSHAREDXX}" = ""; then
|
||||
|
|
Loading…
Add table
Reference in a new issue