stuck on "upgrading from 3.7 to 3.8 - Exception handling flag day"

[merlyn_(_at_)_stonehenge_(_dot_)_com (Randal L. Schwartz)]

>From http://openbsd.org/faq/upgrade-old.html
I see that I need to issue the following:

     # cd /usr/src/gnu/lib/libstdc++
     # make -f Makefile.bsd-wrapper cleandir
     # make -f Makefile.bsd-wrapper obj
     # make -f Makefile.bsd-wrapper
     # make -f Makefile.bsd-wrapper install

I have updated my gcc (3 times now :).  When I get to the next-to-last
step (before install), my build aborts with:

    c++ -I/usr/src/gnu/lib/libstdc++/../../usr.bin/gcc/gcc -I/usr/src/gnu/lib/libstdc++/../libiberty/include -I/usr/src/gnu/lib/libstdc++/obj/include/i386-unknown-openbsd3.8 -I/usr/src/gnu/lib/libstdc++/obj/include -I/usr/src/gnu/lib/libstdc++/libstdc++/libsupc++ -O2 -pipe -fno-implicit-templates -Wall -Wno-format -W -Wwrite-strings -fdiagnostics-show-location=once -ffunction-sections -fdata-sections -c /usr/src/gnu/lib/libstdc++/libstdc++/libsupc++/eh_alloc.cc  -fPIC -DPIC -o eh_alloc.o
    In file included from /usr/src/gnu/lib/libstdc++/obj/include/cstdlib:49,
                     from /usr/src/gnu/lib/libstdc++/libstdc++/libsupc++/eh_alloc.cc:33:
    /usr/src/gnu/lib/libstdc++/obj/include/i386-unknown-openbsd3.8/bits/c++config.h:35:29: bits/os_defines.h: No such file or directory
    *** Error code 1

    Stop in /usr/src/gnu/lib/libstdc++/obj/libsupc++.
    *** Error code 1

    Stop in /usr/src/gnu/lib/libstdc++/obj (line 304 of Makefile).
    *** Error code 1

    Stop in /usr/src/gnu/lib/libstdc++/obj (line 419 of Makefile).
    *** Error code 1

    Stop in /usr/src/gnu/lib/libstdc++ (line 22 of /usr/src/gnu/lib/libstdc++/Makefile.bsd-wrapper).

Help!  What am I doing wrong?  It's holding up a "cd /usr/src && make build"
as well.  Do I dare issue "make -k" to get past that?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn_(_at_)_stonehenge_(_dot_)_com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!