diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:33 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:33 +0000 |
| commit | 894552696df8a3ce94c930f37228a0e0d31c1663 (patch) | |
| tree | c5f5295cceee1a4ef76751818e6e6fcba856e792 | |
| parent | 15aa5cd800728546719ef9466297d66835b753fd (diff) | |
| download | ruby-894552696df8a3ce94c930f37228a0e0d31c1663.tar.gz ruby-894552696df8a3ce94c930f37228a0e0d31c1663.tar.xz ruby-894552696df8a3ce94c930f37228a0e0d31c1663.zip | |
merges r20236 from trunk into ruby_1_9_1.
* configure.in (LDSHARED): do not suppress debug info if higher debug
level is given, on cygwin and mingw.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Nov 15 22:23:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LDSHARED): do not suppress debug info if higher debug + level is given, on cygwin and mingw. + Thu Nov 13 11:31:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread.c (rb_barrier_wait): gets rid of recursive deadlock. diff --git a/configure.in b/configure.in index 26e8c4790..3051da2df 100644 --- a/configure.in +++ b/configure.in @@ -1445,7 +1445,7 @@ if test "$with_dln_a_out" != yes; then : ${LDSHARED='ld -Bshareable -x'} LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" rb_cv_dlopen=yes;; - cygwin*|mingw*) : ${LDSHARED="${CC} -shared -s"} + cygwin*|mingw*) : ${LDSHARED="${CC} -shared "'$(if $(filter-out -g -g0,$(debugflags)),,-s)'} XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all" : ${LIBPATHENV=""} |