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

Diff for /src/Makefile.cross between version 1.93 and 1.94

version 1.93, 2017/03/21 10:41:33 version 1.94, 2017/05/23 14:57:30
Line 82 
Line 82 
 .for _arch in ${TARGET_ARCH}  .for _arch in ${TARGET_ARCH}
 .if !empty(CLANG_ARCH:M${_arch})  .if !empty(CLANG_ARCH:M${_arch})
 COMPILER_VERSION=clang  COMPILER_VERSION=clang
   BUILD_CLANG=yes
 .elif !empty(GCC3_ARCH:M${_arch})  .elif !empty(GCC3_ARCH:M${_arch})
 COMPILER_VERSION=gcc3  COMPILER_VERSION=gcc3
 .else  .else
Line 231 
Line 232 
             MACHINE_ARCH=${TARGET_ARCH} \              MACHINE_ARCH=${TARGET_ARCH} \
             ${MAKE} depend)              ${MAKE} depend)
         (cd ${.CURDIR}/gnu/usr.bin/clang; \          (cd ${.CURDIR}/gnu/usr.bin/clang; \
               CC=clang CXX=clang++ \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             MACHINE_ARCH=${TARGET_ARCH} \              MACHINE_ARCH=${TARGET_ARCH} \
             ${MAKE} all)              ${MAKE} all)
Line 241 
Line 243 
             ${MAKE} install)              ${MAKE} install)
         mv ${CROSSDIR}/usr/bin/clang ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang          mv ${CROSSDIR}/usr/bin/clang ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang
         mv ${CROSSDIR}/usr/bin/clang++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++          mv ${CROSSDIR}/usr/bin/clang++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++
           mv ${CROSSDIR}/usr/bin/ld ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld
         cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang          cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang
           cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-ld
         ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc          ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
         ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++          ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
           ln -sf ${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
         echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc; \          echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc; \
         chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc;          chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc;
         echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --driver-mode=g++ --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++; \          echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --driver-mode=g++ --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++; \
Line 325 
Line 330 
             BSDOBJDIR=${CROSSDIR}/usr/obj; \              BSDOBJDIR=${CROSSDIR}/usr/obj; \
         export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \          export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
         (cd ${.CURDIR}/lib; \          (cd ${.CURDIR}/lib; \
             for lib in csu libc; do \              for lib in csu libcompiler_rt libc; do \
             (cd $$lib; \              (cd $$lib; \
                 eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \                  eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${MAKE} depend all ;\                      ${MAKE} depend all ;\
Legend:
Removed from v.1.93  
changed lines
  Added in v.1.94