Changeset 345

Show
Ignore:
Timestamp:
07/22/06 04:32:33 (2 years ago)
Author:
tg
Message:

I guess I should use := instead of = in prereq.mk to benefit GNU make
also add GMAKE there, as MAKE can be both

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r344 r345  
    123123                chmod 555 lbin/uname; \ 
    124124        fi 
    125         @echo "BASH=$$(lbin/which bash)" >>lbin/prereq.mk 
    126         @echo "GNU_HOST_NAME=$$(${CC} -dumpmachine | sed \ 
     125        @echo "BASH:=$$(lbin/which bash)" >>lbin/prereq.mk 
     126        @echo 'GMAKE:=${GMAKE}' >>lbin/prereq.mk 
     127        @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine | sed \ 
    127128            -e 's!mirbsd!openbsd!g' \ 
    128129            )" >>lbin/prereq.mk 
    129         @echo "HOST_ARCH=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ 
     130        @echo "HOST_ARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ 
    130131            -e 's/sparc.*/sparc/' \ 
    131132            -e 's/arm.*/arm/g' \ 
    …… 
    139140            -e 's/i[3-9]86/i386/' \ 
    140141            )" >>lbin/prereq.mk 
    141         @echo 'HOSTCC=${CC}' >>lbin/prereq.mk 
     142        @echo 'HOSTCC:=${CC}' >>lbin/prereq.mk 
    142143        @x="$$(echo 'f:\n\techo P:$${CFLAGS}\n.include <bsd.prog.mk>' | \ 
    143144            ${MAKE} -f - f EXPERIMENTAL=yes 2>/dev/null | grep '^P:' \ 
    144145            2>/dev/null | sed 's/^P://')"; \ 
    145             echo "HOSTCFLAGS=$${x:--O2 ${CFLAGS}}" | sed 's/ *$$//' \ 
     146            echo "HOSTCFLAGS:=$${x:--O2 ${CFLAGS}}" | sed 's/ *$$//' \ 
    146147            >>lbin/prereq.mk 
    147         @echo 'LC_ALL=C' >>lbin/prereq.mk 
    148         @echo 'MAKE=${GMAKE}' >>lbin/prereq.mk 
    149         @echo "OStype=$$(env NOFAKE=yes uname)" >>lbin/prereq.mk 
    150         @echo "_PATH=$$PATH" >>lbin/prereq.mk 
    151         @echo "PATH=$$(pwd)/lbin:$$PATH" >>lbin/prereq.mk 
    152         @echo "SHELL=$$(lbin/which bash)" >>lbin/prereq.mk 
    153         @echo "TOPDIR=$$(readlink -nf .)" >>lbin/prereq.mk 
     148        @echo 'LC_ALL:=C' >>lbin/prereq.mk 
     149        @echo 'MAKE:=${GMAKE}' >>lbin/prereq.mk 
     150        @echo "OStype:=$$(env NOFAKE=yes uname)" >>lbin/prereq.mk 
     151        @echo "_PATH:=$$PATH" >>lbin/prereq.mk 
     152        @echo "PATH:=$$(pwd)/lbin:$$PATH" >>lbin/prereq.mk 
     153        @echo "SHELL:=$$(lbin/which bash)" >>lbin/prereq.mk 
     154        @echo "TOPDIR:=$$(readlink -nf .)" >>lbin/prereq.mk 
    154155        @env NO_ERROR=${NO_ERROR} bash scripts/scan-tools.sh 
    155156        @ln -s $$(lbin/which ${CC}) lbin/gcc