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

Diff for /src/Makefile.cross between version 1.42 and 1.43

version 1.42, 2011/06/16 10:09:51 version 1.43, 2011/07/05 00:15:03
Line 73 
Line 73 
 CROSSGCC=       ${CROSSDIR}/.gcc_done  CROSSGCC=       ${CROSSDIR}/.gcc_done
 #NO_CROSS=      isakmpd keynote ssh  #NO_CROSS=      isakmpd keynote ssh
   
 # bsd.own.mk can't do it for us  GCC2_ARCH=m68k m88k sparc vax
 .if ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \  GCC4_ARCH=amd64 hppa i386 mips64* powerpc sparc64
     ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"  BINUTILS217_ARCH=ia64
   OLD_BINUTILS_ARCH=m68k m88k vax
   
   .for _arch in ${TARGET_ARCH}
   .if !empty(GCC2_ARCH:M${_arch})
   USE_GCC3?=no
 TARGET_USE_GCC3=No  TARGET_USE_GCC3=No
 COMPILER_VERSION=gcc2  COMPILER_VERSION?=gcc2
 .elif ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "hppa" || \  .elif !empty(GCC4_ARCH:M${_arch})
     ${TARGET_ARCH} == "i386" || ${TARGET_ARCH:Mmips64*} || \  
     ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"  
 TARGET_USE_GCC4=Yes  TARGET_USE_GCC4=Yes
 COMPILER_VERSION=gcc4  COMPILER_VERSION?=gcc4
 .else  .else
 TARGET_USE_GCC3=Yes  TARGET_USE_GCC3=Yes
 COMPILER_VERSION=gcc3  COMPILER_VERSION?=gcc3
 .endif  .endif
   
   .if !empty(BINUTILS217_ARCH:M${_arch})
   BINUTILS_VERSION=binutils-2.17
   .else
   BINUTILS_VERSION=binutils
   .endif
   
   .if !empty(OLD_BINUTILS_ARCH:M${_arch})
   NEW_BINUTILS?=  No
   BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip
   .else
   NEW_BINUTILS?=  Yes
   BINUTILS=       ar as gasp ld nm objcopy objdump ranlib readelf size \
                   strings strip
   .endif
   BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
   .endfor
   
 # 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 \
 #               ftp gzsig sasyncd vnconfig  #               ftp gzsig sasyncd vnconfig
Line 98 
Line 118 
 NO_CROSS+=bind  NO_CROSS+=bind
 NO_CROSS+=httpd  NO_CROSS+=httpd
 NO_CROSS+=microcode  NO_CROSS+=microcode
 NO_CROSS+=groff lynx binutils perl texinfo gcc cvs  NO_CROSS+=groff lynx binutils binutils-2.17 perl texinfo gcc cvs
 NO_CROSS+=nsd  NO_CROSS+=nsd
   
 cross-dirs:     ${CROSSDIRS}  cross-dirs:     ${CROSSDIRS}
Line 161 
Line 181 
             ${MAKE} DESTDIR=${CROSSDIR} includes)              ${MAKE} DESTDIR=${CROSSDIR} includes)
         @touch ${CROSSINCLUDES}          @touch ${CROSSINCLUDES}
   
 .if (${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \  
      ${TARGET_ARCH} == "vax")  
 BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip  
 NEW_BINUTILS?=  No  
 .else  
 BINUTILS=       ar as gasp ld nm objcopy objdump ranlib readelf size \  
                 strings strip  
 NEW_BINUTILS?=  Yes  
 .endif  
   
 ${CROSSBINUTILS}:       ${CROSSINCLUDES}  ${CROSSBINUTILS}:       ${CROSSINCLUDES}
         (cd ${.CURDIR}/gnu/usr.bin/binutils; \          (cd ${.CURDIR}/${BINUTILS_DIR}; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             USING_NEW_BINUTILS=${NEW_BINUTILS} \              USING_NEW_BINUTILS=${NEW_BINUTILS} \
             TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \              TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43