summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 12:20:34 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 12:20:34 +0000
commit0e1b92874b7ce28f8208f455bc41fe1a5580e750 (patch)
tree3498eaab7e2c8cd71fa7a91fb560723409f8711a
parentb44352521505ae054e4f333122bbaf77b9a8d5d0 (diff)
* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
remove adding $(archdir) to $LIBPATH. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog25
-rw-r--r--lib/mkmf.rb4
2 files changed, 16 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index b97327f..188b9eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,20 @@
+Sun Dec 15 21:16:44 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
+ remove adding $(archdir) to $LIBPATH.
+
Sat Dec 15 12:15:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
- * configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
- eval.c, file.c, hash.c, io.c, main.c, missing.c,
- process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
- bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
- ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
- ext/socket/getnameinfo.c, ext/socket/socket.c,
- ext/tcltklib/stubs.c
- : replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
- * wince/exe.mak : delete \r at the end of lines.
- * wince/mswince-ruby17.def : delete rb_obj_become
+ * configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
+ eval.c, file.c, hash.c, io.c, main.c, missing.c,
+ process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
+ bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
+ ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
+ ext/socket/getnameinfo.c, ext/socket/socket.c,
+ ext/tcltklib/stubs.c
+ : replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
+ * wince/exe.mak : delete \r at the end of lines.
+ * wince/mswince-ruby17.def : delete rb_obj_become
Sun Dec 15 11:43:26 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index bf66134..0dcd32b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -780,16 +780,14 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
- $LIBPATH = []
+ $LIBPATH = $extmk ? ["$(topdir)"] : []
$objs = nil
$libs = ""
if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
- $LIBPATH = ["$(topdir)"]
$LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING
$LIBRUBYARG = config['LIBRUBYARG']
end
- $LIBPATH << "$(archdir)"
$LOCAL_LIBS = ""
dir_config("opt")