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

Diff for /src/Makefile.cross between version 1.3 and 1.9

version 1.3, 2005/01/12 00:06:28 version 1.9, 2005/09/11 23:07:21
Line 13 
Line 13 
 CROSSENV=       AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \  CROSSENV=       AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
                 CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \                  CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \
                 CXX=${CROSSDIR}/usr/bin/c++ \                  CXX=${CROSSDIR}/usr/bin/c++ \
                 LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \                  LD=${CROSSDIR}/usr/bin/ld \
                 LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \                  LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
                 SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \                  STRIP=${CROSSDIR}/usr/bin/strip \
                 HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \                  HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \
                 HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \                  HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \
                 HOSTLDFLAGS=\"${LDFLAGS} \" \                  HOSTLDFLAGS=\"${LDFLAGS} \" \
Line 37 
Line 37 
                 photurisd keynote sectok ssh                  photurisd keynote sectok ssh
   
 # no libcrypto.... these won't build  # no libcrypto.... these won't build
 NO_CROSS+=      telnetd login_krb5 login_krb5-or-pwd dc passwd telnet ppp \  NO_CROSS+=      dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet
                 tcpdump  
 # need host setup for ydr  # need host setup for ydr
 NO_CROSS+=afs  NO_CROSS+=afs
 # explicit cross-compile  # explicit cross-compile
Line 67 
Line 66 
                         echo powerpc ;;\                          echo powerpc ;;\
                 sgi) \                  sgi) \
                         echo mips64 ;;\                          echo mips64 ;;\
                   cats|zaurus) \
                           echo arm ;;\
                 *) \                  *) \
                         (echo Unknown arch ${TARGET} >&2) ; exit 1;; \                          (echo Unknown arch ${TARGET} >&2) ; exit 1;; \
         esac > ${CROSSDIR}/TARGET_ARCH          esac > ${CROSSDIR}/TARGET_ARCH
Line 99 
Line 100 
         @(cd ${.CURDIR}/include && \          @(cd ${.CURDIR}/include && \
             MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \              MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               TARGET_ARCH=${TARGET_ARCH} \
             ${MAKE} prereq && \              ${MAKE} prereq && \
             MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \              MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               TARGET_ARCH=${TARGET_ARCH} \
             ${MAKE} DESTDIR=${CROSSDIR} includes)              ${MAKE} DESTDIR=${CROSSDIR} includes)
         @touch ${CROSSINCLUDES}          @touch ${CROSSINCLUDES}
   
Line 183 
Line 186 
         @touch ${CROSSBINUTILS}          @touch ${CROSSBINUTILS}
   
 # bsd.own.mk can't do it for us  # bsd.own.mk can't do it for us
 .if ${TARGET} == "amd64" || ${TARGET} == "cats" || \  .if ${MACHINE_ARCH} == "alpha" || \
     ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \      ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
     ${TARGET} == "i386" || \      ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "vax"
     ${TARGET} == "sparc64" || ${TARGET} == "sgi"  
 TARGET_USE_GCC3=Yes  
 .else  
 TARGET_USE_GCC3=No  TARGET_USE_GCC3=No
   .else
   TARGET_USE_GCC3=Yes
 .endif  .endif
   
 ${CROSSGCC}:            ${CROSSBINUTILS}  ${CROSSGCC}:            ${CROSSBINUTILS}
Line 230 
Line 232 
             ${CROSSDIR}/usr/libexec/cpp              ${CROSSDIR}/usr/libexec/cpp
         sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \          sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
             -e 's#/usr/include#${CROSSDIR}/usr/include#' \              -e 's#/usr/include#${CROSSDIR}/usr/include#' \
               -e 's/@dollaropt@/-$$/' \
             ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp              ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
         chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp          chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
         chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp          chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp
Line 284 
Line 287 
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             SKIPDIR="${NO_CROSS}" \              SKIPDIR="${NO_CROSS}" \
             ${MAKE} cleandir)              ${MAKE} cleandir)
   
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.9