git: Fix cross-build

John Marino marino at crater.dragonflybsd.org
Mon Oct 29 13:13:31 PDT 2012


commit f8a7506473aa7a5a8f1871d5af183ad368d5e9be
Author: John Marino <draco at marino.st>
Date:   Mon Oct 29 20:59:07 2012 +0100

    Fix cross-build
    
    The introduction of BTOOLMAKE and BTOOLCONFIG did not work when
    cross-building.  The value of BTOOLSDEST and CTOOLSDEST change when
    starting stage 2 of the crossworld.  This was never detected before
    because these variables were only used in stage 1.
    
    However, the absolute path to these tools aren't needed.  The PATH
    is defined in the environment to ensure the bootstrap tools are
    used when appropriate.  Previous errors leading me to think the host
    tool was being used may have been caused by other things.
    
    At the same time, all the "${MAKE}" variables were replaced with "make".
    The make program defines "MAKE" as whatever was used to invoke it,
    including paths.  Since we are controlling the path, we don't want any
    surprises.  In any cases, we want "${MAKE}" to equal "make", so just
    hardcode it that way.
    
    Tested on cross-build, bmake-equipped system, and legacy make equipped
    system.

Summary of changes:
 Makefile.inc1 |   97 +++++++++++++++++++++++++++------------------------------
 1 files changed, 46 insertions(+), 51 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/f8a7506473aa7a5a8f1871d5af183ad368d5e9be


-- 
DragonFly BSD source repository


More information about the Commits mailing list