diff --git a/ChangeLog b/ChangeLog
index b7715c4e95aac475f613048ebf7a16b85db51527..28e7e81d775ef5f940c7c2abbc2ecb28774eba4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-27  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* ltcf-cxx.sh (ac_cv_prog_cc_pic_works, ac_cv_prog_cc_static_works):
+	Don't unset, it's non-portable and no longer necessary, set to empty
+	instead.
+
 2001-01-27  Michael Sokolov  <msokolov@ivan.Harhan.ORG>,  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
 	* ltconfig: Shell portability fix for the tagname validity check.
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index 3469e37875b2c6f02ef06e9cff4030710b78e416..1a5a60eabd212fde092da82312d5fd8d651341fb 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -580,9 +580,8 @@ ac_cv_prog_cc_static=
 ac_cv_prog_cc_no_builtin=
 ac_cv_prog_cc_can_build_shared=$can_build_shared
 
-# It is not enough to reset these cached values, they must be unset.
-unset ac_cv_prog_cc_pic_works
-unset ac_cv_prog_cc_static_works
+ac_cv_prog_cc_pic_works=
+ac_cv_prog_cc_static_works=
 
 if test "$with_gcc" = yes; then
   ac_cv_prog_cc_wl='-Wl,'