Changeset 89 for trunk/Makefile

Timestamp:

May 5, 2003, 1:56:10 AM (22 years ago)

Author:

bird

Message:

Symlinking attempt / binutils.

File:

• trunk/Makefile (modified) (4 diffs, 1 prop)

trunk/Makefile

@@ -93 +93 @@
                 all-preload \
                 all-builttools-initial \
+                all-symlinks \
                 \
+        all-binutils \
                 all-gcc \
-        all-binutils \
         all-emx \
                 \
@@ -238 +239 @@
 
 
-
+###############################################################################
+###############################################################################
+###############################################################################
+#
+#    S y m l i n k s
+#
+#
+#               We use symlinking of binutils stuff into the gcc tree so we can
+#               build everything in one go and take advantage of the gcc
+#               makesystem which will use the binutils we built when doing the
+#               gcc libraries and such.
+#
+#               On OS/2 symlinks doesn't exist so, we'll copy the source trees.
+#               Copy because this will for directories work ok with cvs, moving
+#               directories would cause 'cvs update -d' to refetch stuff.
+#
+#
+#w##############################################################################
+###############################################################################
+###############################################################################
+all-symlinks:
+# Don't do this till we've got binutils working.
+#               all-symlinks-binutils
+
+ifeq "$(BUILD_PLATFORM)" "OS2"
+TOOL_SYMLINK_FILE   = cp
+TOOL_SYMLINK_DIR    = cp -Rf
+TOOL_SYMLINK_MKDIR  = mkdir
+TOOL_UNSYMLINK_DIR  = rm -Rf
+else
+TOOL_SYMLINK_FILE   = ln -s
+TOOL_SYMLINK_DIR    = ln -s
+TOOL_SYMLINK_MKDIR  = true
+TOOL_UNSYMLINK_DIR  = rm
+endif
+                        
+SYMLINKS_BINUTILS_TO_GCC_DIRS = \
+bfd \
+binutils \
+etc \
+gas \
+gprof \
+intl \
+ld \
+opcodes \
+texinfo \
+include/aout \
+include/coff \
+include/elf     \
+include/nlm     \
+include/opcode \
+include/regs \
+
+SYMLINKS_BINUTILS_TO_GCC_FILES = \
+include/alloca-conf.h \
+include/ansidecl.h \
+include/bfdlink.h \
+include/bin-bugs.h \
+include/bout.h \
+include/callback.h \
+include/ChangeLog \
+include/COPYING \
+include/demangle.h \
+include/dis-asm.h \
+include/dyn-string.h \
+include/filenames.h \
+include/floatformat.h \
+include/fnmatch.h \
+include/fopen-bin.h \
+include/fopen-same.h \
+include/fopen-vms.h \
+include/gdbm.h \
+include/getopt.h \
+include/hashtab.h \
+include/hp-symtab.h \
+include/ieee.h \
+include/libiberty.h \
+include/MAINTAINERS \
+include/md5.h \
+include/oasys.h \
+include/objalloc.h \
+include/obstack.h \
+include/os9k.h \
+include/partition.h \
+include/progress.h \
+include/remote-sim.h \
+include/safe-ctype.h \
+include/sim-d10v.h \
+include/sort.h \
+include/splay-tree.h \
+include/symcat.h \
+        
+# Symlink binutils stuff to gcc.
+#       Note the test should've been "! -e", but that doesn' work in ash... :/
+all-symlinks-binutils:
+        for file in $(SYMLINKS_BINUTILS_TO_GCC_FILES); do \
+                if [ ! -f "$(PATH_TOP)/src/gcc/$$file" ]; then  \
+                        $(TOOL_SYMLINK_FILE)  $(PATH_TOP)/src/binutils/$$file $(PATH_TOP)/src/gcc/$$file && \
+                        touch                 $(PATH_TOP)/src/gcc/$${file}.symlinked ; \
+                fi ; \
+        done
+        for dir in $(SYMLINKS_BINUTILS_TO_GCC_DIRS) ; do \
+                if [ ! -d "$(PATH_TOP)/src/gcc/$$dir" ] ; then  \
+                        $(TOOL_SYMLINK_MKDIR) $(PATH_TOP)/src/gcc/$$dir && \
+                        touch                 $(PATH_TOP)/src/gcc/$${dir}.symlinked && \
+                        $(TOOL_SYMLINK_DIR)   $(PATH_TOP)/src/binutils/$$dir $(PATH_TOP)/src/gcc/ ; \
+                fi ; \
+        done
+
+all-symlinks-unlink-binutils:
+        for file in $(SYMLINKS_BINUTILS_TO_GCC_FILES); do \
+                if [ -f "$(PATH_TOP)/src/gcc/$${file}.symlinked" ]; then  \
+                        rm  $(PATH_TOP)/src/gcc/$${file} && \
+                        rm  $(PATH_TOP)/src/gcc/$${file}.symlinked ; \
+                fi ; \
+        done
+        for dir in $(SYMLINKS_BINUTILS_TO_GCC_DIRS) ; do \
+                if [ -f "$(PATH_TOP)/src/gcc/$$dir.symlinked" ] ; then  \
+                        $(TOOL_UNSYMLINK_DIR) $(PATH_TOP)/src/gcc/$${dir} && \
+                        rm                    $(PATH_TOP)/src/gcc/$${dir}.symlinked ; \
+                fi ; \
+        done
+                                                
 
 ###############################################################################
@@ -271 +394 @@
 gcc/libjava/libltdl \
 gcc/libobjc \
+\
+gcc/bfd \
+gcc/binutils \
+gcc/gas \
+gcc/gprof \
+gcc/intl \
+gcc/ld \
+gcc/libiberty \
+gcc/opcodes \
 
 GCC_CONFIGURE_DIRS = $(GCC_DIRS)
@@ -369 +501 @@
 ###############################################################################
 all-binutils  binutils:
-        echo "Successfully build BinUtils."
-        echo "Warning!!! BinUtils not yet done!"
-
-                
-                
-
-
+        echo "Binutils are build together with the other GNU Tools in GCC."
+        echo "Separate building of binutils is not configured."
+
+
+
+# Generate diffs for GCC (v3.2.2) - part of packing a release.
+.PHONY: binutils-diff $(PATH_BIN)/usr/src/binutils/binutils-2.11.2.diff
+binutils-diff: $(PATH_BIN)/usr/src/binutils/binutils-2.11.2.diff
+$(PATH_BIN)/usr/src/binutils/binutils-2.11.2.diff:
+        mkdir -p $(@D)
+        -cvs diff -R -N -w -c -r BINUTILS_2-11-2 src/binutils > $@
+        
 
 ###############################################################################