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

Diff for /src/Makefile.cross between version 1.88 and 1.89

version 1.88, 2016/09/23 09:18:05 version 1.89, 2016/12/18 17:03:08
Line 6 
Line 6 
   
 # 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} == "armv7")  .if     (${TARGET} == "arm64")
   TARGET_ARCH=    aarch64
   .elif   (${TARGET} == "armv7")
 TARGET_ARCH=    arm  TARGET_ARCH=    arm
 .elif   (${TARGET} == "luna88k")  .elif   (${TARGET} == "luna88k")
 TARGET_ARCH=    m88k  TARGET_ARCH=    m88k
Line 26 
Line 28 
   
 # List of LP64 archs  # List of LP64 archs
 # XXX move to bsd.*.mk?  # XXX move to bsd.*.mk?
 LP64_ARCH = amd64 alpha mips64 sparc64  LP64_ARCH = aarch64 amd64 alpha mips64 sparc64
   
 TARGET_IS_LP64 =  TARGET_IS_LP64 =
 MACHINE_IS_LP64 =  MACHINE_IS_LP64 =
Line 77 
Line 79 
 .include <bsd.own.mk>  .include <bsd.own.mk>
   
 .for _arch in ${TARGET_ARCH}  .for _arch in ${TARGET_ARCH}
 .if !empty(GCC3_ARCH:M${_arch})  .if !empty(CLANG_ARCH:M${_arch})
   COMPILER_VERSION=clang
   .elif !empty(GCC3_ARCH:M${_arch})
 COMPILER_VERSION=gcc3  COMPILER_VERSION=gcc3
 .else  .else
 COMPILER_VERSION=gcc4  COMPILER_VERSION=gcc4
Line 174 
Line 178 
         @touch ${CROSSINCLUDES}          @touch ${CROSSINCLUDES}
   
 ${CROSSBINUTILS}:       ${CROSSINCLUDES}  ${CROSSBINUTILS}:       ${CROSSINCLUDES}
   .if ${TARGET_ARCH} != "aarch64"
         (cd ${.CURDIR}/${BINUTILS_DIR}; \          (cd ${.CURDIR}/${BINUTILS_DIR}; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             PIE_DEFAULT=${PIE_DEFAULT} \              PIE_DEFAULT=${PIE_DEFAULT} \
Line 208 
Line 213 
                 ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\                  ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\
          fi ;\           fi ;\
         done          done
   .endif
         @touch ${CROSSBINUTILS}          @touch ${CROSSBINUTILS}
   
   
 ${CROSSGCC}:            ${CROSSBINUTILS}  ${CROSSGCC}:            ${CROSSBINUTILS}
 .if ${COMPILER_VERSION:L} == "gcc3"  .if ${COMPILER_VERSION:L} == "clang"
           (cd ${.CURDIR}/gnu/usr.bin/clang; \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               MACHINE_ARCH=${TARGET_ARCH} \
               ${MAKE} obj)
           (cd ${.CURDIR}/gnu/usr.bin/clang; \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               MACHINE_ARCH=${TARGET_ARCH} \
               ${MAKE} depend)
           (cd ${.CURDIR}/gnu/usr.bin/clang; \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               MACHINE_ARCH=${TARGET_ARCH} \
               ${MAKE} all)
           (cd ${.CURDIR}/gnu/usr.bin/clang; \
               DESTDIR=${CROSSDIR} \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               MACHINE_ARCH=${TARGET_ARCH} \
               ${MAKE} install)
           mv ${CROSSDIR}/usr/bin/clang ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang
           mv ${CROSSDIR}/usr/bin/clang++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++
           cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
           cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
           ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
           ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
   .elif ${COMPILER_VERSION:L} == "gcc3"
         (cd ${.CURDIR}/gnu/usr.bin/gcc; \          (cd ${.CURDIR}/gnu/usr.bin/gcc; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \              TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
Legend:
Removed from v.1.88  
changed lines
  Added in v.1.89