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

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

version 1.11, 2005/09/11 23:10:07 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 50 
Line 55 
 CROSSBINUTILS=  ${CROSSDIR}/usr/bin/.binutils_done  CROSSBINUTILS=  ${CROSSDIR}/usr/bin/.binutils_done
 CROSSGCC=       ${CROSSDIR}/usr/bin/.gcc_done  CROSSGCC=       ${CROSSDIR}/usr/bin/.gcc_done
 NO_CROSS=       isakmpd tn3270 less sudo openssl libkeynote libssl \  NO_CROSS=       isakmpd tn3270 less sudo openssl libkeynote libssl \
                 photurisd keynote sectok ssh                  keynote sectok ssh
   
 # no libcrypto.... these won't build  # no libcrypto.... these won't build
 NO_CROSS+=      dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet  NO_CROSS+=      dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet
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 149 
Line 156 
         ln -sf ${CROSSDIR}/usr/bin/ld \          ln -sf ${CROSSDIR}/usr/bin/ld \
             ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld              ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
         (cd ${.CURDIR}/usr.bin/ar; \          (cd ${.CURDIR}/usr.bin/ar; \
               ELF_TOOLCHAIN=no \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
               ELF_TOOLCHAIN=no \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/ar \          ln -sf ${CROSSDIR}/usr/bin/ar \
             ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar              ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar
         (cd ${.CURDIR}/usr.bin/ranlib; \          (cd ${.CURDIR}/usr.bin/ranlib; \
               ELF_TOOLCHAIN=no \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
               ELF_TOOLCHAIN=no \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
         ln -sf ${CROSSDIR}/usr/bin/ranlib \          ln -sf ${CROSSDIR}/usr/bin/ranlib \
Line 187 
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
Line 248 
Line 258 
             for lib in csu libc; do \              for lib in csu libc; do \
             (cd $$lib; \              (cd $$lib; \
                 eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \                  eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${MAKE} depend all install); \                      ${MAKE} WANTLINT=no depend all install); \
             done; \              done; \
             eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                 SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \                  SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
                 ${MAKE} depend all install)                  ${MAKE} WANTLINT=no depend all install)
   
 cross-bin:      ${CROSSOBJ}  cross-bin:      ${CROSSOBJ}
         MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \          MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
Line 266 
Line 276 
   
 cross-etc-root-var:     ${CROSSOBJ}  cross-etc-root-var:     ${CROSSOBJ}
         (cd ${.CURDIR}/etc && \          (cd ${.CURDIR}/etc && \
               MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
             DESTDIR=${CROSSDIR} ${MAKE} distribution-etc-root-var)              DESTDIR=${CROSSDIR} ${MAKE} distribution-etc-root-var)
   
 cross-depend:  cross-depend:
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.22