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

Diff for /src/Makefile.cross between version 1.10 and 1.11

version 1.10, 2005/09/11 23:08:30 version 1.11, 2005/09/11 23:10:07
Line 3 
Line 3 
 cross-tools:    cross-includes cross-binutils cross-gcc cross-lib  cross-tools:    cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:  cross-tools cross-bin cross-etc-root-var  cross-distrib:  cross-tools cross-bin cross-etc-root-var
   
   # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
   # this variable to work.
   .if     (${TARGET} == "cats" || ${TARGET} == "zaurus")
   TARGET_ARCH=    arm
   .elif   (${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
            ${TARGET} == "mvme68k")
   TARGET_ARCH=    m68k
   .elif   (${TARGET} == "luna88k" || ${TARGET} == "mvme88k")
   TARGET_ARCH=    m88k
   .elif   (${TARGET} == "sgi")
   TARGET_ARCH=    mips64
   .elif   (${TARGET} == "macppc" || ${TARGET} == "mvmeppc")
   TARGET_ARCH=    powerpc
   .else
   TARGET_ARCH=    ${TARGET}
   .endif
   
 CROSSCPPFLAGS?= -nostdinc -I${CROSSDIR}/usr/include  CROSSCPPFLAGS?= -nostdinc -I${CROSSDIR}/usr/include
 CROSSLDFLAGS?=  -nostdlib -L${CROSSDIR}/usr/lib -static  CROSSLDFLAGS?=  -nostdlib -L${CROSSDIR}/usr/lib -static
 CROSSCFLAGS?=   ${CROSSCPPFLAGS}  CROSSCFLAGS?=   ${CROSSCPPFLAGS}
Line 18 
Line 35 
                 STRIP=${CROSSDIR}/usr/bin/strip \                  STRIP=${CROSSDIR}/usr/bin/strip \
                 HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \                  HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \
                 HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \                  HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \
                 HOSTLDFLAGS=\"${LDFLAGS} \" \                  HOSTLDFLAGS=\"${LDFLAGS}\" \
                 CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \                  CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
                 CXXFLAGS=\"${CROSSCXXFLAGS}\" \                  CXXFLAGS=\"${CROSSCXXFLAGS}\" \
                 LDFLAGS=\"${CROSSLDFLAGS}\"                  LDFLAGS=\"${CROSSLDFLAGS}\"
Line 26 
Line 43 
 CROSSLANGS?=    c c++  CROSSLANGS?=    c c++
   
 TARGET_CANON=`cat ${CROSSDIR}/TARGET_CANON`  TARGET_CANON=`cat ${CROSSDIR}/TARGET_CANON`
 TARGET_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`  
   
 CROSSDIRS=      ${CROSSDIR}/.dirs_done  CROSSDIRS=      ${CROSSDIR}/.dirs_done
 CROSSOBJ=       ${CROSSDIR}/usr/obj/.obj_done  CROSSOBJ=       ${CROSSDIR}/usr/obj/.obj_done
Line 55 
Line 71 
   
 ${CROSSDIRS}:  ${CROSSDIRS}:
         @-mkdir -p ${CROSSDIR}          @-mkdir -p ${CROSSDIR}
         @case ${TARGET} in \          @echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
                 alpha|amd64|hppa|hppa64|i386|m68k|m88k|powerpc|sparc|sparc64|vax) \  
                         echo ${TARGET} ;;\  
                 amiga|hp300|mac68k|mvme68k) \  
                         echo m68k ;;\  
                 luna88k|mvme88k) \  
                         echo m88k ;;\  
                 macppc|mvmeppc) \  
                         echo powerpc ;;\  
                 sgi) \  
                         echo mips64 ;;\  
                 cats|zaurus) \  
                         echo arm ;;\  
                 *) \  
                         (echo Unknown arch ${TARGET} >&2) ; exit 1;; \  
         esac > ${CROSSDIR}/TARGET_ARCH  
         @echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`          @echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
         @eval `grep '^osr=' sys/conf/newvers.sh`; \          @eval `grep '^osr=' sys/conf/newvers.sh`; \
            sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \             sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
Line 108 
Line 109 
             ${MAKE} DESTDIR=${CROSSDIR} includes)              ${MAKE} DESTDIR=${CROSSDIR} includes)
         @touch ${CROSSINCLUDES}          @touch ${CROSSINCLUDES}
   
 .if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \  .if (${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
     ${MACHINE_ARCH} == "vax"       ${TARGET_ARCH} == "vax")
 BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip  BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip
 NEW_BINUTILS?=  No  NEW_BINUTILS?=  No
 .else  .else
Line 186 
Line 187 
         @touch ${CROSSBINUTILS}          @touch ${CROSSBINUTILS}
   
 # bsd.own.mk can't do it for us  # bsd.own.mk can't do it for us
 .if ${MACHINE_ARCH} == "alpha" || \  .if ${TARGET_ARCH} == "alpha" || \
     ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \      ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
     ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "vax"      ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"
 TARGET_USE_GCC3=No  TARGET_USE_GCC3=No
 .else  .else
 TARGET_USE_GCC3=Yes  TARGET_USE_GCC3=Yes
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11