[BACK]Return to Makefile.cross CVS log [TXT][DIR] Up to [local] / src

Diff for /src/Makefile.cross between version 1.15 and 1.22

version 1.15, 2006/04/19 18:32:39 version 1.22, 2006/12/19 23:17:54
Line 5 
Line 5 
   
 # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving  # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
 # this variable to work.  # this variable to work.
 .if     (${TARGET} == "cats" || ${TARGET} == "zaurus")  .if     (${TARGET} == "armish" || ${TARGET} == "cats" || ${TARGET} == "zaurus")
 TARGET_ARCH=    arm  TARGET_ARCH=    arm
 .elif   (${TARGET} == "hp300" || ${TARGET} == "mac68k" || \  .elif   (${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
          ${TARGET} == "mvme68k")           ${TARGET} == "mvme68k")
 TARGET_ARCH=    m68k  TARGET_ARCH=    m68k
 .elif   (${TARGET} == "luna88k" || ${TARGET} == "mvme88k")  .elif   (${TARGET} == "aviion" || ${TARGET} == "luna88k" || \
            ${TARGET} == "mvme88k")
 TARGET_ARCH=    m88k  TARGET_ARCH=    m88k
 .elif   (${TARGET} == "sgi")  .elif   (${TARGET} == "sgi")
 TARGET_ARCH=    mips64  TARGET_ARCH=    mips64
   .elif   (${TARGET} == "solbourne")
   TARGET_ARCH=    sparc
 .elif   (${TARGET} == "macppc" || ${TARGET} == "mvmeppc")  .elif   (${TARGET} == "macppc" || ${TARGET} == "mvmeppc")
 TARGET_ARCH=    powerpc  TARGET_ARCH=    powerpc
   .elif   (${TARGET} == "landisk")
   TARGET_ARCH=    sh
 .else  .else
 TARGET_ARCH=    ${TARGET}  TARGET_ARCH=    ${TARGET}
 .endif  .endif
Line 120 
Line 125 
 .endif  .endif
   
 ${CROSSBINUTILS}:       ${CROSSINCLUDES}  ${CROSSBINUTILS}:       ${CROSSINCLUDES}
 .if ${NEW_BINUTILS:L} == "yes"  
         (cd ${.CURDIR}/gnu/usr.bin/binutils; \          (cd ${.CURDIR}/gnu/usr.bin/binutils; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               USING_NEW_BINUTILS=${NEW_BINUTILS} \
             TARGET_ARCH=${TARGET_ARCH} \              TARGET_ARCH=${TARGET_ARCH} \
             ${MAKE} -f Makefile.bsd-wrapper depend && \              ${MAKE} -f Makefile.bsd-wrapper depend && \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               USING_NEW_BINUTILS=${NEW_BINUTILS} \
             TARGET_ARCH=${TARGET_ARCH} \              TARGET_ARCH=${TARGET_ARCH} \
             ${MAKE} -f Makefile.bsd-wrapper all && \              ${MAKE} -f Makefile.bsd-wrapper all && \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               USING_NEW_BINUTILS=${NEW_BINUTILS} \
             ${MAKE} -f Makefile.bsd-wrapper install)              ${MAKE} -f Makefile.bsd-wrapper install)
 .else  .if ${NEW_BINUTILS:L} != "yes"
         (cd ${.CURDIR}/gnu/usr.bin/gas; \          (cd ${.CURDIR}/gnu/usr.bin/gas; \
             TARGET_MACHINE_ARCH=${TARGET_ARCH} \              TARGET_MACHINE_ARCH=${TARGET_ARCH} \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
Line 191 
Line 198 
         @touch ${CROSSBINUTILS}          @touch ${CROSSBINUTILS}
   
 # bsd.own.mk can't do it for us  # bsd.own.mk can't do it for us
 .if ${TARGET_ARCH} == "alpha" || \  .if ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
     ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \  
     ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"      ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"
 TARGET_USE_GCC3=No  TARGET_USE_GCC3=No
 .else  .else
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.22