summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-03-12 10:20:01 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-03-12 10:20:01 +0000
commit8fc5876485fb84bf9c93b569ff0cb57cf2b21f7d (patch)
tree5f25f4fb542d06de4421a0e44f9389327e7f74cd
parent118ff2766177504abbbd8dbb4dae3bd16c3772a8 (diff)
* lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb4
-rw-r--r--version.h4
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a949a7025c..3dd36ff543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 12 18:59:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
+
Sun Mar 11 00:55:31 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/mkmf.rb (install_rb): fix handling of destination path.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f3438fbac8..4692ea73c1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -354,6 +354,8 @@ def dir_config(target, idefault=nil, ldefault=nil)
end
def create_makefile(target, srcdir = File.dirname($0))
+ save_libs = $libs.dup
+ save_libpath = $LIBPATH.dup
print "creating Makefile\n"
rm_f "conftest*"
STDOUT.flush
@@ -540,6 +542,8 @@ EOMF
dfile.close
end
mfile.close
+ $libs = save_libs
+ $LIBPATH = save_libpath
end
$OBJEXT = CONFIG["OBJEXT"]
diff --git a/version.h b/version.h
index ba55f61871..237e936d09 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.0"
-#define RUBY_RELEASE_DATE "2001-03-10"
+#define RUBY_RELEASE_DATE "2001-03-12"
#define RUBY_VERSION_CODE 170
-#define RUBY_RELEASE_CODE 20010310
+#define RUBY_RELEASE_CODE 20010312