gkeating 03/02/11 13:43:02
Modified: live/gcc3 GNUmakefile build_gcc
Log:
Delete stuff that (a) doesn't work, and (b) isn't being used.
Reviewed by: devang
Revision Changes Path
1.34 +1 -110 src/live/gcc3/GNUmakefile
Index: GNUmakefile
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/GNUmakefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- GNUmakefile 2003/01/04 01:15:07 1.33
+++ GNUmakefile 2003/02/11 21:43:01 1.34
@@ -165,7 +165,7 @@
#######################################################################
-install: installhdrs build install_no_src # libkeymgr
+install: installhdrs build install_no_src
@echo
@echo ++++++++++++++
@echo + Installing +
@@ -183,7 +183,6 @@
ln -s $(VERSION) default; \
fi
-# Add cplusplus_hdrs someday...
installhdrs: DSTROOT
@echo
@echo ++++++++++++++++++++++
@@ -316,114 +315,6 @@
find -d "$(SRCROOT)" \( -type d -a -name CVS -o \
-type f -a -name .DS_Store \) \
-exec rm -rf {} \;
-
-#######################################################################
-# C++-related targets
-#
-# Headers go into $(cpp_hdr_dir), set below to
-# /usr/include/gcc/darwin/$(VERSION)/g++
-#
-# For now, be explicit instead of theoretically "FSF-correct"
-
-# Most of libstdc++
-LIBSTDCPP_HDRS = cassert cctype cerrno cfloat ciso646 \
- climits clocale cmath complex complex.h csetjmp \
- csignal cstdarg cstddef cstdio cstdlib cstring ctime \
- cwchar cwctype fstream iomanip iosfwd iostream \
- stdexcept stl.h string strstream
-
-LIBSTDCPP_STL_HDRS = algo.h algobase.h algorithm alloc.h bvector.h \
- defalloc.h deque deque.h function.h functional hash_map hash_map.h \
- hash_set hash_set.h hashtable.h heap.h iterator iterator.h list \
- list.h map map.h memory multimap.h multiset.h numeric pair.h \
- pthread_alloc pthread_alloc.h queue rope rope.h ropeimpl.h set \
- set.h slist slist.h stack stack.h stl_algo.h stl_algobase.h \
- stl_alloc.h stl_bvector.h stl_config.h stl_construct.h stl_deque.h \
- stl_function.h stl_hash_fun.h stl_hash_map.h stl_hash_set.h \
- stl_hashtable.h stl_heap.h stl_iterator.h stl_list.h stl_map.h \
- stl_multimap.h stl_multiset.h stl_numeric.h stl_pair.h stl_queue.h \
- stl_raw_storage_iter.h stl_relops.h stl_rope.h stl_set.h \
- stl_slist.h stl_stack.h stl_tempbuf.h stl_tree.h \
- stl_uninitialized.h stl_vector.h tempbuf.h tree.h type_traits.h \
- utility vector vector.h
-
-LIBSTDCPP_STD_HDRS = bastring.cc bastring.h complext.cc complext.h \
- dcomplex.h fcomplex.h ldcomplex.h straits.h
-
-# Some of the standard headers (e.g., <fstream>, <iomanip>)
-# just #include these <*.h> versions from ./libio.
-LIBIO_HDRS = fstream.h iomanip.h iostream.h \
- libio.h streambuf.h strfile.h strstream.h
-
-# DO WE NEED THE OTHERS? These are all of the *other* .h
-# files in libio. I suspect we'll need to install some
-# of them. Any that we find we need, just move from here
-# into LIBIO_HDRS.
-#
-LIBIO_OTHER_H = PlotFile.h SFile.h builtinbuf.h editbuf.h \
- floatio.h indstream.h iolibio.h iostdio.h iostreamP.h \
- istream.h libioP.h ostream.h parsestream.h pfstream.h \
- procbuf.h stdiostream.h stream.h
-
-cpp_hdr_dir=$(gcc_hdr_dir)/g++
-
-cplusplus_hdrs: DSTROOT
- mkdir -p $(cpp_hdr_dir)
- for file in exception new new.h typeinfo; do \
- install -c -m 444 gcc/cp/inc/$$file $(cpp_hdr_dir); \
- done
- for file in $(LIBSTDCPP_HDRS); do \
- install -c -m 444 libstdc++/$$file $(cpp_hdr_dir); \
- done
- for file in $(LIBSTDCPP_STL_HDRS); do \
- install -c -m 444 libstdc++/stl/$$file $(cpp_hdr_dir); \
- done
- for file in $(LIBSTDCPP_STD_HDRS); do \
- install -c -m 444 libstdc++/std/$$file $(cpp_hdr_dir); \
- done
- for file in $(LIBIO_HDRS); do \
- install -c -m 444 libio/$$file $(cpp_hdr_dir); \
- done
- install -c -m 444 _G_config.h $(cpp_hdr_dir)
- cd $(cpp_hdr_dir) && rm -f std && ln -s . std
-
-#######################################################################
-
-# keymgr build into system framework.
-# Since keymgr must be built 3 times (debug, profile, optimized)
-# and named according to the option set used (libxxx.a, libxxx_debug.a,
-# libxxx_profile.a), this build directly places the build result in the dst
-# directory.
-
-SYS_FRAMEWORK_DST = $(DSTROOT)/usr/local/lib/system
-KEYMGR_OBJ = $(OBJROOT)/keymgr
-KEYMGR_DEFINES = -DMACOSX -DPART_OF_SYSTEM_FRAMEWORK
-CFLAGS = -I$(SRCROOT)/gcc/config/apple $(RC_CFLAGS) $(OTHER_CFLAGS)
$(KEYMGR_DEFINES)
-CC = $(DSTROOT)/usr/bin/cc -no-cpp-precomp
-
-libkeymgr: $(KEYMGR_OBJ)/libkeymgr.a $(KEYMGR_OBJ)/libkeymgr_debug.a \
- $(KEYMGR_OBJ)/libkeymgr_profile.a
- install -d $(SYS_FRAMEWORK_DST)
- install -c -m 444 $(KEYMGR_OBJ)/libkeymgr.a \
- $(KEYMGR_OBJ)/libkeymgr_debug.a \
- $(KEYMGR_OBJ)/libkeymgr_profile.a \
- $(SYS_FRAMEWORK_DST)
-
-$(KEYMGR_OBJ)/libkeymgr.a: keymgr.c $(SRCROOT)/gcc/config/apple/keymgr.h \
- KEYMGR_OBJ
- $(CC) $(CFLAGS) -O2 -c -o $(KEYMGR_OBJ)/keymgr.o keymgr.c
- libtool -static -o $@ $(KEYMGR_OBJ)/keymgr.o
-
-$(KEYMGR_OBJ)/libkeymgr_debug.a: keymgr.c $(SRCROOT)/gcc/config/apple/keymgr.h\
- KEYMGR_OBJ
- $(CC) $(CFLAGS) -g -c -o $(KEYMGR_OBJ)/keymgr.o keymgr.c
- libtool -static -o $@ $(KEYMGR_OBJ)/keymgr.o
-
-$(KEYMGR_OBJ)/libkeymgr_profile.a: keymgr.c \
- $(SRCROOT)/gcc/config/apple/keymgr.h \
- KEYMGR_OBJ
- $(CC) $(CFLAGS) -pg -c -o $(KEYMGR_OBJ)/keymgr.o keymgr.c
- libtool -static -o $@ $(KEYMGR_OBJ)/keymgr.o
#######################################################################
1.71 +5 -17 src/live/gcc3/build_gcc
Index: build_gcc
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/build_gcc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- build_gcc 2003/02/04 00:15:26 1.70
+++ build_gcc 2003/02/11 21:43:01 1.71
@@ -53,20 +53,9 @@
#
BUILD=$arch
- #
- # Get the version - we use this to create some dir names
- #
- CCVERS=`cd $SRCROOT; vers_string -f gcc 2>/dev/null`
- if [ "$CCVERS" = "gcc-" ]; then
- CCVERS="<no version>"
- fi
-
gcc_version=`fgrep version_string < $SRCROOT/gcc/version.c | \
sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
- # grope around for build # of associated compiler
- APPLE_CC=`sed -ne '/apple_version_str/ s/^.*"\([0-9]*\)".*$/\1/p' <
$SRCROOT/gcc/version.c`
-
#
# What compilers to configure and build...
#
@@ -75,7 +64,7 @@
# Suffix to add to the tools. ("3" for 10.2 installed version)
SUFFIX=3
# Name (and install_name!) of libstdc++.dylib to build (if any.)
- LIBSTDCPP_DYLIB=libstdc++.dylib # formerly
libstdc++.${APPLE_CC}.dylib
+ LIBSTDCPP_DYLIB=libstdc++.dylib
LIBSTDCPP_DYLIB_VERSION=A
LIBRARIES="libgcc.a libcc_kext.a libgcc_static.a libsupc++.a $LIBSTDCPP_DYLIB
libstdc++.a libcc_noc++.a"
TOOLS="gcc$SUFFIX g++$SUFFIX c++$SUFFIX c++filt$SUFFIX gcov$SUFFIX cpp$SUFFIX"
# c++3 must be after g++3 in the list
@@ -121,14 +110,12 @@
"SYMROOT = $SYMROOT" \
"DSTROOT = $DSTROOT" \
"RC_RELEASE = $RC_RELEASE" \
- "VERSION = $CCVERS" \
"CFLAGS = `echo \"$CFLAGS\" | sed -e 's/^[ ]*//'`" \
"OPT_OVERRIDE = $OPT_OVERRIDE" \
"NEXT_ROOT = $NEXT_ROOT" \
"BUILD = $BUILD" \
"BOOTSTRAP = $BOOTSTRAP" \
"PREFIX = $PREFIX" \
- "APPLE_CC = $APPLE_CC" \
"DO_SYMLINKS = $DO_SYMLINKS" \
"ENABLE_CHECKING = $ENABLE_CHECKING" \
"Default cc = `\cc -v 2>&1 | fgrep 'gcc version' | \
@@ -1276,7 +1263,7 @@
install_new_cc()
{
box_title -? "You must have the most recent version of the compiler" \
- "(host=$arch, target=$target, version=$CCVERS) installed" \
+ "(host=$arch, target=$target) installed" \
"on the build host to finish this build... " \
"OR have $host as one of the RC_HOSTS elements."
exit 1
@@ -1378,7 +1365,7 @@
## /libgcc_static.a
## /libgcc.a
## /crtbegin.o
-## /libstdc++.${APPLE_CC}.dylib
+## /libstdc++.dylib
## /default --> VERSION
##
## /usr/lib/libstdc++.a --> gcc/darwin/default/libstdc++.a
@@ -1561,7 +1548,8 @@
fi
fi
if [ "$file" = "$LIBSTDCPP_DYLIB" ] ; then
- # Make libstdc++.dylib point at libstdc++.${APPLE_CC}.dylib.
+ # Make libstdc++.dylib point at libstdc++.dylib.
+ # (that comment no longer makes sense.)
# Note this file "belongs" to the OS; it should NOT routinely change
when a new compiler is installed.
$n ln -s $LIBSTDCPP_DYLIB_VERSION/$LIBSTDCPP_DYLIB
$fat/$privatelib/../libstdc++.dylib
fi
