summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-06-03 17:14:03 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-06-03 17:14:03 +0000
commitf33175b32f6549d534e0f5b1206cac104c508214 (patch)
treeaed44ac2d6853f7f8a2bf54826691359d69ea50f
parent99a9c703c631f3e3d5b43eb83bb82842125cb0ac (diff)
see ChangeLog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/tcltklib/tcltklib.c2
-rw-r--r--lib/mkmf.rb1
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b2865f3873..dd98f14bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 4 02:01:10 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * lib/mkmf.rb: do not need to add -L$(topdir) in --enable-shared case.
+
Sun Jun 4 01:02:00 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* ext/Win32API/Win32API.c: directly "call" in asm statement for
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index 0760b36b3f..462d594ec0 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -34,6 +34,7 @@ static VALUE ip_invoke_real _((int, VALUE*, VALUE));
/* from tkAppInit.c */
+#if !defined __MINGW32__
/*
* The following variable is a special hack that is needed in order for
* Sun shared libraries to be used for Tcl.
@@ -41,6 +42,7 @@ static VALUE ip_invoke_real _((int, VALUE*, VALUE));
extern int matherr();
int *tclDummyMathPtr = (int *) matherr;
+#endif
/*---- module TclTkLib ----*/
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 1df53ceb06..8cfbaf0c15 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -330,7 +330,6 @@ def create_makefile(target)
if $configure_args['--enable-shared']
$libs = CONFIG["LIBRUBYARG"] + " " + $libs
- $DLDFLAGS = $DLDFLAGS + " -L$(topdir)"
end
if RUBY_PLATFORM =~ /beos/