summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-03 07:18:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-03 07:18:03 +0000
commit3c1ca14a797d278c10f3f1a095ce1712abc57c6c (patch)
tree7befbf0c928f4b931605e6901ea8ff343c11b9eb
parenteb389cd823e32c4603ec2174e14787b1e8cb6ffe (diff)
* configure.in (XLDFLAGS): added --enable-auto-import for cygwin and
mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ccd291d9a..92db4161ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Nov 3 16:04:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 3 16:18:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (XLDFLAGS): added --enable-auto-import for cygwin and
+ mingw.
* common.mk (revision.h): have to be updated daily or by non-trivial
commits.
diff --git a/configure.in b/configure.in
index 9cafbe87da..26041b6335 100644
--- a/configure.in
+++ b/configure.in
@@ -1256,10 +1256,12 @@ if test "$with_dln_a_out" != yes; then
LDSHARED="$LDSHARED ${linker_flag}-G"
DLDFLAGS='-eInit_$(TARGET)'
XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl"
+ XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
: ${ARCHFILE="ruby.imp"}
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
: ${LIBPATHENV=SHLIB_PATH}
+ RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s"
rb_cv_dlopen=yes ;;
human*) : ${DLDFLAGS=''}
: ${LDSHARED=''}
@@ -1285,7 +1287,7 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
rb_cv_dlopen=yes;;
cygwin*|mingw*) : ${LDSHARED="${CC} -shared -s"}
- XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
+ XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000,--enable-auto-import"
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
: ${LIBPATHENV=""}
rb_cv_dlopen=yes ;;