Changeset 1127


Ignore:
Timestamp:
Jan 31, 2004, 7:56:46 AM (22 years ago)
Author:
bird
Message:

Working on quick bootstrap method.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.62 to 1.63
    r1126 r1127  
    137137                \
    138138                all-symlinks-unlink
    139         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     139        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    140140        @echo "+ Make Ended Successfully: $(shell date)"
    141         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     141        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    142142
    143143#
    … …  
    146146               
    147147all-banner-start:
    148         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     148        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    149149        @echo "+ Make started: $(shell date)"
    150         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     150        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    151151               
    152152all-banner-stage1:
    153         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     153        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    154154        @echo "+ Stage 1 - starting: $(shell date)"
    155         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     155        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    156156
    157157all-banner-stage2:
    158         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     158        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    159159        @echo "+ Stage 2 - starting: $(shell date)"
    160         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     160        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    161161       
    162162all-banner-builttools-initial:
    163         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     163        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    164164        @echo "+ Initializing builttools tree"
    165         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     165        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    166166               
    167167all-banner-builttools-stage2:
    168         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     168        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    169169        @echo "+ Copying stage2 builttools"
    170         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     170        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    171171
    172172all-banner-install:
    173         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     173        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    174174        @echo "+ Install - starting: $(shell date)"
    175         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     175        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    176176       
    177177all-banner-install-done:
    178         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     178        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    179179        @echo "+ Install - done: $(shell date)"
    180         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     180        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    181181
    182182all-banner-symlinks-start:
    183         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     183        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    184184        @echo "+ symlinks - staring: $(shell date)"
    185         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     185        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    186186               
    187187all-banner-symlinks-done:
    188         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     188        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    189189        @echo "+ symlinks - done: $(shell date)"
    190         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     190        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    191191
    192192all-banner-symlinks-unlink-start:
    193         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     193        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    194194        @echo "+ symlinks unlinking - staring: $(shell date)"
    195         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     195        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    196196               
    197197all-banner-symlinks-unlink-done:
    198         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     198        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    199199        @echo "+ symlinks unlinking - done: $(shell date)"
    200         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     200        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    201201                                                               
    202202               
    … …  
    206206       
    207207all-env:       
    208         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     208        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    209209        @echo "Variables:"
    210210        @echo "    PWD                  = $(PWD)"
    … …  
    260260        @echo "    OBJC_INCLUDE_PATH    = $(OBJC_INCLUDE_PATH)"
    261261        @echo "    LIBRARY_PATH         = $(LIBRARY_PATH)"
    262         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     262        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    263263        @echo "Content of PATH_OBJ:"
    264264        -ls -la $(PATH_OBJ)/
    265         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     265        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    266266        @echo "Content of PATH_BIN:"
    267267        -ls -la $(PATH_BIN)/
    268         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     268        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    269269       
    270270       
    … …  
    352352        echo "$(@F)" > $(PATH_OBJ)/.last-stage
    353353        touch $@
    354         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     354        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    355355        @echo "+ Stage 1 - done: $(shell date)"
    356         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     356        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    357357
    358358all-stage1-it: \
    … …  
    370370        echo "$(@F)" > $(PATH_OBJ)/.last-stage
    371371        touch $@
    372         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     372        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    373373        @echo "+ Stage 2 - done: $(shell date)"
    374         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     374        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    375375
    376376$(PATH_OBJ)/.all-stage2.save-stage1:
    377         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     377        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    378378        @echo "+ Saving Stage 1 - Starting: $(shell date)"
    379         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     379        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    380380        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-preload-unload
    381381        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-builttools-stage2
    … …  
    387387        $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-preload
    388388        touch $@
    389         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     389        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    390390        @echo "+ Saving Stage 1 - done: $(shell date)"
    391         @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++"
     391        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
    392392       
    393393all-stage2-it: \
    … …  
    417417        emx-diff \
    418418       
    419        
    420        
    421        
    422        
     419                                                                               
     420       
     421       
     422
     423###############################################################################
     424###############################################################################
     425###############################################################################
     426#
     427#    Q u i c k   b o o t s t r a p p i n g
     428#
     429###############################################################################
     430###############################################################################
     431###############################################################################
     432
     433
     434quick all-quick:
     435        mkdir -p $(PATH_OBJ)
     436        $(NICE) $(MAKE) $(MAKEOPT) -j 1 -C . all-quick-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/build-`date +"%Y%m%d-%H%M%S"`.log
     437
     438all-quick-banner-start:
     439        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     440        @echo "+ Quick Bootstrap started:            $(shell date)"
     441        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     442all-quick-logged: \
     443        all-quick-banner-start \
     444                all-env \
     445                all-sanity \
     446                all-preload \
     447                all-versionstamps \
     448                all-symlinks-unlink \
     449                \
     450                all-quick-stage1 \
     451                all-quick-stage2 \
     452                all-quick-stage3 \
     453                all-quick-stage4 \
     454                \
     455                all-quick-install
     456        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     457        @echo "+ Quick Bootstrap Ended Successfully: $(shell date)"
     458        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     459
     460# stage 1 builds the base libraries.   
     461all-quick-stage1: $(PATH_OBJ)/.quick-stage1
     462all-quick-stage1-it: \
     463                all-preload-unload \
     464                all-builttools-initial \
     465                all-preload \
     466        emx-quick-libs \
     467                all-preload-unload \
     468                emx-quick-libs-install \
     469                all-preload
     470$(PATH_OBJ)/.quick-stage1:
     471        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     472        @echo "+ Quick Bootstrap Stage 1 - starting: $(shell date)"
     473        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     474        $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-stage1-it
     475        echo "$(@F)" > $(PATH_OBJ)/.quick-last-stage
     476        touch $@
     477        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     478        @echo "+ Quick Bootstrap Stage 1 - done:     $(shell date)"
     479        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     480
     481# stage 2 builds the emx base utilities.
     482all-quick-stage2: $(PATH_OBJ)/.quick-stage2
     483all-quick-stage2-it: \
     484        emx-quick-rest \
     485                all-preload-unload \
     486                emx-quick-rest-install \
     487                all-preload
     488$(PATH_OBJ)/.quick-stage2:
     489        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     490        @echo "+ Quick Bootstrap Stage 2 - starting: $(shell date)"
     491        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     492        $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-stage2-it
     493        echo "$(@F)" > $(PATH_OBJ)/.quick-last-stage
     494        touch $@
     495        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     496        @echo "+ Quick Bootstrap Stage 2 - done:     $(shell date)"
     497        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     498
     499# stage 3 builds all the binutil utilities and libraries.
     500all-quick-stage3: $(PATH_OBJ)/.quick-stage3
     501all-quick-stage3-it: \
     502        binutils-quick \
     503                all-preload-unload \
     504                binutils-quick-installstage \
     505                all-preload
     506$(PATH_OBJ)/.quick-stage3:
     507        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     508        @echo "+ Quick Bootstrap Stage 3 - starting: $(shell date)"
     509        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     510        $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-stage3-it
     511        echo "$(@F)" > $(PATH_OBJ)/.quick-last-stage
     512        touch $@
     513        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     514        @echo "+ Quick Bootstrap Stage 3 - done:     $(shell date)"
     515        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     516
     517# stage 4 builds gcc.
     518all-quick-stage4: $(PATH_OBJ)/.quick-stage4
     519all-quick-stage4-it: \
     520        gcc-quick \
     521                all-preload-unload \
     522                gcc-quick-installstage \
     523                all-preload
     524$(PATH_OBJ)/.quick-stage4:
     525        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     526        @echo "+ Quick Bootstrap Stage 4 - starting: $(shell date)"
     527        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     528        $(MAKE) $(MAKEOPT) -f $(MAKEFILE) all-quick-stage4-it
     529        echo "$(@F)" > $(PATH_OBJ)/.quick-last-stage
     530        touch $@
     531        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     532        @echo "+ Quick Bootstrap Stage 4 - done:     $(shell date)"
     533        @echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
     534
     535
     536# Installs the stuff we've built.                       
     537all-quick-install:
     538        echo todo
     539       
     540
    423541       
    424542###############################################################################
    … …  
    660778all-gcc       gcc:      \
    661779        gcc-autoconf-refresh \
    662         gcc-build
     780        gcc-bootstrap
    663781        echo "Successfully build GCC."
    664782
    … …  
    713831       
    714832# build the components.
    715 .PHONY: gcc-build gcc-install gcc-configure
    716 gcc-build gcc-install gcc-configure:
     833.PHONY: gcc-bootstrap gcc-build gcc-install gcc-configure
     834gcc-bootstrap gcc-build gcc-install gcc-configure:
    717835        mkdir -p $(PATH_OBJ)/gcc
    718836        $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_OBJ)/gcc -f $(MAKEFILE) $@-it
    … …  
    728846#              -specs $(PATH_TOP)/tools/x86.os2/gcc/staged/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs)
    729847SPECS_HACK =
    730 gcc-build-it: \
     848gcc-bootstrap-it gcc-build-it: \
    731849                $(PATH_OBJ)/gcc/.ts.configured
    732850ifeq "$(BUILD_PLATFORM)" "OS2"         
    … …  
    738856                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf" \
    739857                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zhigh-mem -Zcrtdll -Zstack 1024 -Zomf" \
    740                 bootstrap
     858                $(subst build, all, $(patsubst gcc-%-it, %, $@))
    741859else
    742         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc bootstrap
     860        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc $(subst build, all, $(patsubst gcc-%-it, %, $@))
    743861endif   
    744862               
    … …  
    802920##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs $(PATH_OBJ)/gcc/gcc/specs
    803921
     922
     923# Quick bootstrap workers.
     924gcc-quick:  \
     925        gcc-autoconf-refresh \
     926        gcc-build
     927       
     928gcc-quick-installstage:
     929        rm -Rf $(PATH_BUILTTOOLS_TMP)
     930        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
     931        cp -Rf $(PATH_BUILTTOOLS_TMP)/* $(PATH_BUILTTOOLS)/
     932
    804933               
    805934# Generate diffs for GCC (v3.2.2) - part of packing a release.
    … …  
    809938        mkdir -p $(@D)
    810939        $(TOOL_CVS_DIFF_TREE) $(GCC_CVS_REL) src/gcc > $@
    811 
    812                
    813                
    814 ##############################################################################
    815 ###############################################################################
    816 ###############################################################################
    817 #
    818 #    G C C   -   O M F   f o r   D e B u G i n g
    819 #
    820 ###############################################################################
    821 ###############################################################################
    822 ###############################################################################
    823 all-gccomf: gccomf
    824 gccomf:
    825         mkdir -p $(PATH_OBJ)/gccomf
    826         $(NICE) $(MAKE) $(MAKEOPT) -C . gccomf-logged 2>&1 | $(UNIXROOT)/usr/bin/tee $(PATH_OBJ)/gccomf/build-`date +"%Y%m%d-%H%M%S"`.log
    827                                        
    828 gccomf-logged: \
    829                 gcc-autoconf-refresh \
    830         gccomf-build
    831         echo "Unbelievable!!! We just successfully completed a GCC OMF build!!!"
    832 
    833 # build the components.
    834 .PHONY: gccomf-build gccomf-install gccomf-configure
    835 gccomf-build gccomf-install gccomf-configure:
    836         mkdir -p $(PATH_OBJ)/gccomf
    837         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
    838 
    839 
    840 # Separate since we want the 'e' option
    841 gccomf-shell:                   
    842         mkdir -p $(PATH_OBJ)/gccomf
    843         $(MAKE) $(MAKEOPT) -e -C $(PATH_OBJ)/gccomf -f $(MAKEFILE) $@-it
    844 gccomf-shell-it:
    845         chdir $(PATH_OBJ)/gccomf ; \
    846                 if test -d $(PATH_BUILTTOOLS)/omfhack; then mv -f $(PATH_BUILTTOOLS)/omfhack $(PATH_BUILTTOOLS)/omfhackbin; fi ; \
    847                 if test ! -d $(PATH_BUILTTOOLS)/omfhackbin; then echo "no omfhackbin"; exit 1; fi ; \
    848                 unset GCCLOAD; \
    849                 export GCC_OMF="real"; \
    850             export LIBGCC2_DEBUG_CFLAGS="-g -Zhigh-mem -Zaout"; \
    851                 export       CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
    852                 export     CXXFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
    853                 export  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g "; \
    854                 export      LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024"; \
    855                 export BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024"; \
    856                 $(subst \,/,$(COMSPEC)) ; \
    857                 mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
    858        
    859 
    860 # When changed directory
    861 #   We pass down alot of flags here, but currently we don't use half of them as
    862 #   we're not booting the compiler.
    863 
    864 #OMFSPEC_HACK = $(if $(wildchar $(PATH_OBJ)/.all-stage1),\
    865 #               -specs $(PATH_TOP)/src/emx/src/lib/libc.specs, \
    866 #               -specs $(PATH_TOP)/tools/x86.os2/gcc/staged/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs)
    867 OMFSPECS_HACK =
    868 gccomf-build-it: \
    869                 $(PATH_OBJ)/gccomf/.ts.configured
    870 ifeq "$(BUILD_PLATFORM)" "OS2"         
    871         if test -d $(PATH_BUILTTOOLS)/omfhack; then mv -f $(PATH_BUILTTOOLS)/omfhack $(PATH_BUILTTOOLS)/omfhackbin; fi
    872         if test ! -d $(PATH_BUILTTOOLS)/omfhackbin; then echo "no omfhackbin"; exit 1; fi ; \
    873         unset GCCLOAD ; export GCC_OMF="real" ; echo GCC_OMF=$$GCC_OMF; $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gccomf \
    874             LIBGCC2_DEBUG_CFLAGS="-g -Zhigh-mem -Zaout" \
    875                       CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
    876                     CXXFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
    877                  BOOT_CFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g " \
    878                      LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024" \
    879                 BOOT_LDFLAGS="$(OMFSPEC_HACK) -Zhigh-mem -Zomf -g -Zcrtdll -Zstack 1024" \
    880                 -e all
    881         mv -f $(PATH_BUILTTOOLS)/omfhackbin $(PATH_BUILTTOOLS)/omfhack
    882 else
    883         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc all
    884 endif   
    885 
    886        
    887 # configure it (invoked after directory change).
    888 #       We set CC to help configure finding it.
    889 gccomf-configure-it $(PATH_OBJ)/gccomf/.ts.configured: $(PATH_TOP)/src/gcc/configure
    890 ifeq "$(BUILD_PLATFORM)" "OS2"
    891         $(ASH) -c " \
    892                 export CC=\"gcc.exe\" ; \
    893                 $< \
    894                 --enable-clh \
    895                 --enable-threads=os2 \
    896                 --enable-shared=libgcc,bfd,opcodes \
    897                 --disable-nls \
    898                 --without-included-gettext \
    899                 --with-local-prefix=$(subst \,/,$(PATH_EMXPGCC)) \
    900                 --prefix=/gcc \
    901                 --with-gnu-ld \
    902                 --with-gnu-as \
    903                 --disable-libgcj \
    904                 --enable-languages=c,c++ "
    905 else
    906         $(ASH) -c "$< \
    907                 --disable-clh \
    908                 --enable-shared=libgcc,bfd,opcodes \
    909                 --disable-nls \
    910                 --without-included-gettext \
    911                 --with-local-prefix=$(subst \,/,$(PATH_EMXPGCC)) \
    912                 --prefix=/gcc \
    913                 --with-gnu-ld \
    914                 --with-gnu-as \
    915                 --disable-libgcj \
    916                 --enable-languages=c,c++ "
    917 endif
    918         touch $(PATH_OBJ)/gccomf/.ts.configured
    919 # TODO: Andy, on Linux --enable-clh result in linking errors.
    920 
    921 # Install the GCC build
    922 #       Repeating the prefix doesn't hurt anybody.
    923 gccomf-install-it:
    924         $(MAKE) $(MAKEOPT) prefix=$(ALL_PREFIX) install
    925940
    926941
    … …  
    958973        echo "Separate building of binutils is not configured."
    959974
    960 all-binutils214 binutils214:    \
     975binutils214:    \
    961976        binutils-autoconf-refresh \
    962977        binutils-build
    … …  
    10771092       
    10781093
     1094# Quick bootstrap workers.
     1095binutils-quick: binutils214
     1096
     1097binutils-quick-installstage:
     1098        rm -Rf $(PATH_BUILTTOOLS_TMP)
     1099        $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils prefix=$(PATH_BUILTTOOLS_TMPD) install
     1100        cp -Rf $(PATH_BUILTTOOLS_TMP)/* $(PATH_BUILTTOOLS)/
     1101
    10791102                                       
    10801103# Generate diffs for Binutils (part of packing).
    … …  
    11551178
    11561179
    1157 # Generate diffs for Binutils (part of packing).
    1158 .PHONY: binutils-diff $(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff
     1180# Quick bootstrap workers.                     
     1181emx-quick-libs:
     1182        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/src/emx/libonly.gmk -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
     1183
     1184emx-quick-libs-install:
     1185        $(MAKE) $(MAKEOPT) -f $(PATH_TOP)/src/emx/libonly.gmk -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
     1186                                       
     1187emx-quick-rest:
     1188        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
     1189                       
     1190emx-quick-rest-install:
     1191        $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/ install
     1192                               
     1193
     1194# Generate diffs for EMX (part of packing).
     1195.PHONY: emx-diff $(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff
    11591196emx-diff: $(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff
    11601197$(ALL_PREFIX)/src/diffs/emx-$(EMX_VERSION).diff:
Note: See TracChangeset for help on using the changeset viewer.