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

Diff for /src/Makefile.cross between version 1.104 and 1.105

version 1.104, 2019/10/14 14:38:06 version 1.105, 2019/10/14 15:23:44
Line 80 
Line 80 
 .include <bsd.own.mk>  .include <bsd.own.mk>
   
 .for _arch in ${TARGET_ARCH}  .for _arch in ${TARGET_ARCH}
 .if !empty(CLANG_ARCH:M${_arch})  .if !empty(GCC3_ARCH:M${_arch})
 COMPILER_VERSION=clang  
 BUILD_CLANG=yes  
 CC=clang  
 CXX=clang++  
 .elif !empty(GCC3_ARCH:M${_arch})  
 COMPILER_VERSION=gcc3  COMPILER_VERSION=gcc3
   BUILD_CLANG=no
 CC=gcc  CC=gcc
 CXX=g++  CXX=g++
 .else  .elif !empty(GCC4_ARCH:M${_arch})
 COMPILER_VERSION=gcc4  COMPILER_VERSION=gcc4
   BUILD_CLANG=no
 CC=gcc  CC=gcc
 CXX=g++  CXX=g++
   .elif !empty(CLANG_ARCH:M${_arch})
   COMPILER_VERSION=clang
   BUILD_CLANG=yes
   CC=clang
   CXX=clang++
 .endif  .endif
   
 .if !empty(LLD_ARCH:M${_arch})  .if !empty(LLD_ARCH:M${_arch})
Line 350 
Line 352 
 cross-lib:      ${CROSSGCC}  cross-lib:      ${CROSSGCC}
         MACHINE=${TARGET} \          MACHINE=${TARGET} \
             MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \              MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
             BSDOBJDIR=${CROSSDIR}/usr/obj; \              BSDOBJDIR=${CROSSDIR}/usr/obj \
         export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \              BUILD_CLANG=${BUILD_CLANG}; \
           export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR BUILD_CLANG; \
         (cd ${.CURDIR}/lib; \          (cd ${.CURDIR}/lib; \
             for lib in csu libcompiler_rt libc; do \              for lib in csu libcompiler_rt libc; do \
             (cd $$lib; \              (cd $$lib; \

Legend:
Removed from v.1.104  
changed lines
  Added in v.1.105