summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-08-06 06:48:25 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-08-06 06:48:25 +0000
commit88b8c7e3ffdbc0116c31b8e9691743567d6e3e34 (patch)
treef3f7b20606f3531ad43c3a75708c4dcf1c37bfee /lib
parentb516f1f25458c78974ff7dc5488b8dfaae997fae (diff)
990806
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/debug.rb14
-rw-r--r--lib/mkmf.rb8
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/debug.rb b/lib/debug.rb
index 78a0ce2..91bad1f 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -68,7 +68,7 @@ class DEBUGGER__
end
case input
- when /^b(?:reak)?\s+((?:[^:\n]+:)?.+)/
+ when /^b(?:reak)?\s+((?:[^:\n]+:)?.+)$/
pos = $1
if pos.index(":")
file, pos = pos.split(":")
@@ -84,7 +84,7 @@ class DEBUGGER__
STDOUT.printf "Set breakpoint %d at %s:%s\n", @break_points.size, file,
pname
- when /^wat(?:ch)?\s+((?:[^:\n]+:)?.+)$/
+ when /^wat(?:ch)?\s+(.+)$/
exp = $1
@break_points.push [true, 1, exp]
STDOUT.printf "Set watchpoint %d\n", @break_points.size, exp
@@ -154,10 +154,10 @@ class DEBUGGER__
end
end
- when /^co(?:nt)?$/
+ when /^c(?:ont)?$/
return
- when /^s(?:tep)?\s*(\d+)?$/
+ when /^s(?:tep)?\s+(\d+)?$/
if $1
lev = $1.to_i
else
@@ -166,7 +166,7 @@ class DEBUGGER__
@stop_next = lev
return
- when /^n(?:ext)?\s*(\d+)?$/
+ when /^n(?:ext)?\s+(\d+)?$/
if $1
lev = $1.to_i
else
@@ -221,7 +221,7 @@ class DEBUGGER__
STDOUT.printf "no sourcefile available for %s\n", binding_file
end
- when /^up\s*(\d+)?$/
+ when /^up\s+(\d+)?$/
previus_line = nil
if $1
lev = $1.to_i
@@ -237,7 +237,7 @@ class DEBUGGER__
info, binding_file, binding_line = frame_info(frame_pos)
STDOUT.printf "#%d %s\n", frame_pos, info
- when /^down\s*(\d+)?$/
+ when /^down\s+(\d+)?$/
previus_line = nil
if $1
lev = $1.to_i
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a3f2a8e..50920a0 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -58,8 +58,8 @@ if /win32|djgpp|mingw32|m68k-human|i386-os2_emx/i =~ RUBY_PLATFORM
else
$null = open("/dev/null", "w")
end
-LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} -I#{CONFIG['includedir']} #{CFLAGS} %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
-CPP = "#{CONFIG['CPP']} -E -I#{$hdrdir} -I#{CONFIG['includedir']} #{CFLAGS} %s %s conftest.c"
+LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
+CPP = "#{CONFIG['CPP']} -E -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c"
$orgerr = $stderr.dup
$orgout = $stdout.dup
@@ -216,7 +216,7 @@ def find_library(lib, func, *paths)
STDOUT.flush
ldflags = $LDFLAGS
- libs = "-l" + lib + " " + $libs
+ libs = append_library($libs, lib)
until try_link(<<"SRC", libs)
int main() { return 0; }
int t() { #{func}(); return 0; }
@@ -427,7 +427,7 @@ hdrdir = #{$hdrdir}
CC = #{CONFIG["CC"]}
-CFLAGS = #{CONFIG["CCDLFLAGS"]} -I$(hdrdir) -I#{CONFIG["includedir"]} #{CFLAGS} #{$CFLAGS} #{$defs.join(" ")}
+CFLAGS = #{CONFIG["CCDLFLAGS"]} -I$(hdrdir) #{CFLAGS} #{$CFLAGS} -I#{CONFIG["includedir"]} #{$defs.join(" ")}
CXXFLAGS = $(CFLAGS)
DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS}
LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}