Changeset 65a60cd in rtems


Ignore:
Timestamp:
10/26/99 14:22:55 (23 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
cb50837d
Parents:
2782e69
Message:

Removed all references to HOST_ARCH including the file gcc.cfg.in. All
host programs are now compiled with automake generated rules. This was
done after discussions with Ralf Corsepius and Eric Norum.

Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • c/src/make/README

    r2782e69 r65a60cd  
    218218            files you want to include.
    219219
    220             Example: custom/pc386.cfg
    221 
    222                CONFIG.$(HOST_ARCH).OS = $(RTEMS_ROOT)/make/os/HPUX-9.0.cfg
    223 
    224                # HOST Compiler config file
    225                # You may also want to specify where the compiler resides here.
    226                CC_$(HOST_ARCH)_DIR=/usr/local
    227                CONFIG.$(HOST_ARCH).CC   = $(RTEMS_ROOT)/make/compilers/gcc.cfg
    228 
    229                ## Target compiler config file, if any
    230                CC_$(TARGET_ARCH)_DIR=$(RTEMS_GNUTOOLS)
    231                CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-pc386.cfg
    232 
    233220        generic rules file
    234221        ------------------
    … …  
    307294            the config files.
    308295
    309             CONFIG.$(HOST_ARCH).CC
    310                         -- full path of C compilation config file, set by custom
    311                            config file.
    312 
    313296            PROJECT_RELEASE
    314297                        -- release/install directory
    … …  
    329312            ARCH        -- target sub-directory for object code
    330313                           [ eg: o-pc386 or o-pc386-debug ]
    331 
    332             HOST_ARCH
    333                         -- host machine architecture name
    334                            [ eg: sun4, sparc on SVR4 ]
    335314
    336315            VARIANTS    -- full list of all possible values for $(ARCH);

  • c/src/make/compilers/Makefile.am

    r2782e69 r65a60cd  
    1111## use gcc-target-default.cfg only.
    1212rtems_make_compilers_DATA= \
    13 gcc.cfg \
    1413gcc-target-default.cfg
    1514
    16 if MAINTAINER_MODE
    17 $(srcdir)/gcc.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/compilers/gcc.cfg.in
    18         cp $< $@
    19 endif
    20 
    2115include $(top_srcdir)/../../../automake/local.am

  • c/src/make/configure.in

    r2782e69 r65a60cd  
    129129custom/default.cfg
    130130compilers/Makefile
    131 compilers/gcc.cfg
    132131)

  • make/README

    r2782e69 r65a60cd  
    218218            files you want to include.
    219219
    220             Example: custom/pc386.cfg
    221 
    222                CONFIG.$(HOST_ARCH).OS = $(RTEMS_ROOT)/make/os/HPUX-9.0.cfg
    223 
    224                # HOST Compiler config file
    225                # You may also want to specify where the compiler resides here.
    226                CC_$(HOST_ARCH)_DIR=/usr/local
    227                CONFIG.$(HOST_ARCH).CC   = $(RTEMS_ROOT)/make/compilers/gcc.cfg
    228 
    229                ## Target compiler config file, if any
    230                CC_$(TARGET_ARCH)_DIR=$(RTEMS_GNUTOOLS)
    231                CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-pc386.cfg
    232 
    233220        generic rules file
    234221        ------------------
    … …  
    307294            the config files.
    308295
    309             CONFIG.$(HOST_ARCH).CC
    310                         -- full path of C compilation config file, set by custom
    311                            config file.
    312 
    313296            PROJECT_RELEASE
    314297                        -- release/install directory
    … …  
    329312            ARCH        -- target sub-directory for object code
    330313                           [ eg: o-pc386 or o-pc386-debug ]
    331 
    332             HOST_ARCH
    333                         -- host machine architecture name
    334                            [ eg: sun4, sparc on SVR4 ]
    335314
    336315            VARIANTS    -- full list of all possible values for $(ARCH);

  • make/compilers/Makefile.am

    r2782e69 r65a60cd  
    88gcc-no_bsp.cfg \
    99gcc-portsw.cfg \
    10 gcc-target-default.cfg \
    11 gcc.cfg.in
     10gcc-target-default.cfg
    1211
    1312## -------------------------------------------------------

  • make/custom/HPUX9-posix.cfg

    r2782e69 r65a60cd  
    66
    77# Specify here the host and target "architectures"
    8 HOST_ARCH=o-$(RTEMS_HOST)
    9 TARGET_ARCH=o-$(RTEMS_BSP)
    10 
    118RTEMS_CPU=unix
    129RTEMS_CPU_FAMILY=hppa1_1

  • make/custom/default.cfg

    r2782e69 r65a60cd  
    1313
    1414# Specify here the host and target "architectures"
    15 HOST_ARCH=o-$(RTEMS_HOST)
    1615ifndef TARGET_ARCH
    1716TARGET_ARCH=o-$(RTEMS_BSP)
    … …  
    3130endif
    3231
    33 # HOST Compiler config file
    34 # You may also want to specify where the compiler resides here.
    35 CONFIG.$(HOST_ARCH).CC   = $(PROJECT_ROOT)/make/compilers/gcc.cfg
    36 
    3732## Target compiler config file, if any
    3833CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg

  • make/leaf.cfg

    r2782e69 r65a60cd  
    3535MANAGERS := $(sort $(MANAGERS))
    3636
    37 # Pull in the desired compiler
    38 # This is almost always the "target" compiler.
    39 # But sometimes, you have to build something on the host.
    40 # Allow for that by allowing individual Makefiles specify $(USE_HOST_COMPILER)
     37# Pull in the desired "target" compiler
     38# Programs built on the host use automake generated rules.
    4139# This will not change $(ARCH) -- binaries will still be place as per target
    42 ifeq (,$(USE_HOST_COMPILER))
    43    include ${CONFIG.$(TARGET_ARCH).CC}
    44 else
    45    include $(CONFIG.$(HOST_ARCH).CC)
    46 endif
     40include ${CONFIG.$(TARGET_ARCH).CC}
    4741ifeq (${DEPEND},$(wildcard ${DEPEND}))
    4842include ${DEPEND}                    # pull in dependencies if they exist
Note: See TracChangeset for help on using the changeset viewer.