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

Diff for /src/Makefile.cross between version 1.53 and 1.60

version 1.53, 2012/07/13 15:54:10 version 1.60, 2013/02/02 13:38:41
Line 88 
Line 88 
   
 .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 124 
Line 120 
 #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 356 
Line 350 
             --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
Line 393 
Line 387 
             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} WANTLINT=no depend all ;\                      ${MAKE} depend all ;\
                 eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \                  eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
                     ${MAKE} WANTLINT=no install); \                      ${MAKE} 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} WANTLINT=no depend all ; \                  ${MAKE} depend all ; \
             eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \              eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
                 SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \                  SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
                 ${MAKE} WANTLINT=no install)                  ${MAKE} install)
   
 cross-bin:      ${CROSSOBJ}  cross-bin:      ${CROSSOBJ}
         MACHINE=${TARGET} \          MACHINE=${TARGET} \
Legend:
Removed from v.1.53  
changed lines
  Added in v.1.60