зеркало из https://github.com/github/ruby.git
* configure.in: can not load libruby.so if gcc is used with
--enable-shared on AIX. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
44c9592d62
Коммит
fa0bec050f
|
@ -1,3 +1,8 @@
|
||||||
|
Sun May 16 02:24:27 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
|
||||||
|
|
||||||
|
* configure.in: can not load libruby.so if gcc is used with
|
||||||
|
--enable-shared on AIX.
|
||||||
|
|
||||||
Sat May 15 17:16:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sat May 15 17:16:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
|
* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
|
||||||
|
|
|
@ -1813,11 +1813,7 @@ if test "$with_dln_a_out" != yes; then
|
||||||
LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
|
LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
|
||||||
fi
|
fi
|
||||||
rb_cv_dlopen=yes],
|
rb_cv_dlopen=yes],
|
||||||
[aix*], [ if test "$GCC" = yes; then
|
[aix*], [ : ${LDSHARED='$(CC)'}
|
||||||
: ${LDSHARED='$(CC) -shared'}
|
|
||||||
else
|
|
||||||
: ${LDSHARED='$(CC)'}
|
|
||||||
fi
|
|
||||||
LDSHARED="$LDSHARED ${linker_flag}-G"
|
LDSHARED="$LDSHARED ${linker_flag}-G"
|
||||||
DLDFLAGS='-eInit_$(TARGET)'
|
DLDFLAGS='-eInit_$(TARGET)'
|
||||||
XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
|
XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
|
||||||
|
@ -1826,7 +1822,7 @@ if test "$with_dln_a_out" != yes; then
|
||||||
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
|
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
|
||||||
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
|
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
|
||||||
: ${LIBPATHENV=SHLIB_PATH}
|
: ${LIBPATHENV=SHLIB_PATH}
|
||||||
RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${LIBPATH:-/usr/lib:/lib}"
|
RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
|
||||||
rb_cv_dlopen=yes],
|
rb_cv_dlopen=yes],
|
||||||
[human*], [ : ${DLDFLAGS=''}
|
[human*], [ : ${DLDFLAGS=''}
|
||||||
: ${LDSHARED=''}
|
: ${LDSHARED=''}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче