Changeset 270c5df5 in rtems


Ignore:
Timestamp:
Jul 17, 2019, 12:19:04 PM (5 weeks ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
6eae5860
Parents:
c4d89de
git-author:
Chris Johns <chrisj@…> (07/17/19 12:19:04)
git-committer:
Chris Johns <chrisj@…> (07/19/19 07:50:05)
Message:

Makefile.inc: Add support for staged builds.

  • Allow the RTEMS_ROOT to be conditionally supplied. This can be a staging area before being moved to the final install prefix location.
  • Update the default.cfg to use RTEMS_ROOT and to not rely on the exec_prefix so it's paths can be staged.
  • Fix and add the needed configure subs.

Closes #3768

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/make/Makefile.am

    rc4d89de r270c5df5  
    6969        -e "s|[@]pkgdatadir[@]|$(pkgdatadir)|" \
    7070        -e "s|[@]RTEMS_BSP[@]|$(RTEMS_BSP)|" \
     71        -e "s|[@]RTEMS_CPU[@]|$(RTEMS_CPU)|" \
     72        -e "s|[@]RTEMS_API[@]|$(RTEMS_API)|" \
    7173        -e "s|[@]CC[@]|$(CC)|" \
    7274        -e "s|[@]CXX[@]|$(CXX)|" \
     
    8688rtems_make_compilersdir = $(rtems_makedir)/compilers
    8789dist_rtems_make_compilers_DATA = compilers/gcc-target-default.cfg
    88 
  • c/src/make/Makefile.inc.in

    rc4d89de r270c5df5  
    22# BSP specific settings. To be included in application Makefiles
    33#
     4# This support will be removed from RTEMS. Please consider other
     5# ways to build applications.
     6#
    47
     8RTEMS_API = @RTEMS_API@
     9
     10RTEMS_CPU = @RTEMS_CPU@
    511RTEMS_BSP = @RTEMS_BSP@
    612
     
    1622SIZE_FOR_TARGET = @SIZE@
    1723OBJCOPY_FOR_TARGET = @OBJCOPY@
    18 
    19 RTEMS_API = @RTEMS_API@
    2024
    2125CC= $(CC_FOR_TARGET)
     
    3741export OBJCOPY
    3842
    39 RTEMS_ROOT = $(prefix)
     43RTEMS_ROOT  ?= $(prefix)
    4044PROJECT_ROOT = $(RTEMS_ROOT)
    4145RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
    42 RTEMS_SHARE = $(RTEMS_ROOT)/share/rtems$(RTEMS_API)
     46RTEMS_SHARE  = $(RTEMS_ROOT)/share/rtems$(RTEMS_API)
    4347
    4448RTEMS_USE_OWN_PDIR = no
     
    5054export RTEMS_CUSTOM
    5155export PROJECT_ROOT
    52 
  • make/custom/default.cfg

    rc4d89de r270c5df5  
    66#   for the initial RTEMS autoconf support.  Thanks. --joel)
    77
    8 include $(exec_prefix)/$(RTEMS_BSP)/make/target.cfg
     8RTEMS_TARGET = $(RTEMS_CPU)-rtems$(RTEMS_API)
     9
     10include $(RTEMS_ROOT)/$(RTEMS_TARGET)/$(RTEMS_BSP)/make/target.cfg
    911include $(RTEMS_SHARE)/make/host.cfg
    1012
    1113include $(RTEMS_ROOT)/make/main.cfg
    12 include $(exec_prefix)/$(RTEMS_BSP)/make/bsp.cfg
     14include $(RTEMS_ROOT)/$(RTEMS_TARGET)/$(RTEMS_BSP)/make/bsp.cfg
    1315
    1416## Target compiler config file, if any
  • make/main.cfg

    rc4d89de r270c5df5  
    1717#
    1818
    19 PROJECT_RELEASE=$(exec_prefix)/$(RTEMS_BSP)
    20 PROJECT_BIN=$(PROJECT_ROOT)/bin
    21 PROJECT_INCLUDE=$(PROJECT_RELEASE)/lib/include
     19PROJECT_RELEASE ?= $(exec_prefix)/$(RTEMS_BSP)
     20PROJECT_BIN = $(PROJECT_ROOT)/bin
     21PROJECT_INCLUDE = $(PROJECT_RELEASE)/lib/include
    2222PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
    2323
     
    7878endif
    7979
    80 .PHONY: $(RECURSE_TARGETS) 
     80.PHONY: $(RECURSE_TARGETS)
    8181.PHONY: clean-generic
    8282.PHONY: distclean-generic
Note: See TracChangeset for help on using the changeset viewer.