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

Diff for /src/Makefile.cross between version 1.54 and 1.63

version 1.54, 2012/08/02 13:38:38 version 1.63, 2013/03/25 17:33:02
Line 7 
Line 7 
 # 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} == "armish" || ${TARGET} == "beagle" || \  .if     (${TARGET} == "armish" || ${TARGET} == "beagle" || \
          ${TARGET} == "gumstix" || ${TARGET} == "palm" || \  
          ${TARGET} == "zaurus")           ${TARGET} == "zaurus")
 TARGET_ARCH=    arm  TARGET_ARCH=    arm
 .elif   (${TARGET} == "hp300" || ${TARGET} == "mvme68k")  .elif   (${TARGET} == "hp300" || ${TARGET} == "mvme68k")
Line 88 
Line 87 
   
 .include <bsd.own.mk>  .include <bsd.own.mk>
   
 OLD_BINUTILS_ARCH=m68k m88k vax  OLD_BINUTILS_ARCH=vax
   
 .for _arch in ${TARGET_ARCH}  .for _arch in ${TARGET_ARCH}
 .if !empty(GCC2_ARCH:M${_arch})  .if !empty(GCC2_ARCH:M${_arch})
 USE_GCC3?=no  COMPILER_VERSION=gcc2
 TARGET_USE_GCC3=No  
 COMPILER_VERSION?=gcc2  
 .elif !empty(GCC4_ARCH:M${_arch})  .elif !empty(GCC4_ARCH:M${_arch})
 TARGET_USE_GCC4=Yes  COMPILER_VERSION=gcc4
 COMPILER_VERSION?=gcc4  
 .else  .else
 TARGET_USE_GCC3=Yes  COMPILER_VERSION=gcc3
 COMPILER_VERSION?=gcc3  
 .endif  .endif
   
 .if !empty(BINUTILS217_ARCH:M${_arch})  .if !empty(BINUTILS217_ARCH:M${_arch})
Line 109 
Line 104 
 BINUTILS_VERSION=binutils  BINUTILS_VERSION=binutils
 .endif  .endif
   
   .if !empty(PIE_ARCH:M${_arch})
   NOPIE_FLAGS=-fno-pie
   NOPIE_LDFLAGS=-nopie
   PIE_DEFAULT=${DEFAULT_PIE_DEF}
   .else
   NOPIE_FLAGS=
   PIE_DEFAULT=
   .endif
   
 .if !empty(OLD_BINUTILS_ARCH:M${_arch})  .if !empty(OLD_BINUTILS_ARCH:M${_arch})
 NEW_BINUTILS?=  No  NEW_BINUTILS?=  No
 BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip  BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip
Line 124 
Line 128 
 #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
   
 # need host setup for ydr  
 NO_CROSS+=afs  
 # explicit cross-compile  # explicit cross-compile
 NO_CROSS+=bind  NO_CROSS+=bind
 NO_CROSS+=httpd  NO_CROSS+=httpd
Line 204 
Line 206 
 ${CROSSBINUTILS}:       ${CROSSINCLUDES}  ${CROSSBINUTILS}:       ${CROSSINCLUDES}
         (cd ${.CURDIR}/${BINUTILS_DIR}; \          (cd ${.CURDIR}/${BINUTILS_DIR}; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             USING_NEW_BINUTILS=${NEW_BINUTILS} \              USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
             TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \              TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
             PATH=${CROSSPATH} \              PATH=${CROSSPATH} \
             ${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} \              USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
             TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \              TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
             ${MAKE} -f Makefile.bsd-wrapper all && \              ${MAKE} -f Makefile.bsd-wrapper all && \
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             COMPILER_VERSION=${COMPILER_VERSION} \              COMPILER_VERSION=${COMPILER_VERSION} \
             USING_NEW_BINUTILS=${NEW_BINUTILS} \              USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
             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} \
Line 356 
Line 358 
             --enable-languages="c,c++" --enable-cpp --disable-nls \              --enable-languages="c,c++" --enable-cpp --disable-nls \
             --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \              --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
             PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \              PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
             CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \              CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
             LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \              LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
             DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \              DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \
             GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \              GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
             ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \              ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \
             GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \              GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
             CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \              CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
             LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \              LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
             build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)              build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
         mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp          mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
Legend:
Removed from v.1.54  
changed lines
  Added in v.1.63