Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/multilib.sminc

    Diff of /trunk/include/multilib.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 31854 by niro, Thu Dec 20 14:06:37 2018 UTC revision 33339 by niro, Wed Jul 12 20:17:12 2023 UTC
    # Line 57  fi Line 57  fi
    57  ##  ##
    58  mlibdir()  mlibdir()
    59  {  {
    60   local libdir=lib   local libdir="${ABI_DEFAULT_LIBDIR}"
    61   [[ ${ARCH} = x86_64 ]] && libdir=lib64   [[ ${ARCH} = i686 ]] && libdir="${ABI_X86_LIBDIR}"
    62     [[ ${ARCH} = x86_64 ]] && libdir="${ABI_X86_64_LIBDIR}"
    63   [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"   [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"
    64    
    65   echo "${libdir}"   echo "${libdir}"
    # Line 72  abi-m32() Line 73  abi-m32()
    73   export ABI="m32"   export ABI="m32"
    74   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
    75   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
    76   export ABI_LIBDIR="lib"   export ABI_LIBDIR="${ABI_X86_LIBDIR}"
    77   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    78   then   then
    79   local saved_ldflags="${LDFLAGS}"   local saved_ldflags="${LDFLAGS}"
    # Line 118  abi-m32() Line 119  abi-m32()
    119   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    120   fi   fi
    121   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    122   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="${ABI_X86_CHOST}"
    123   fi   fi
    124   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    125   then   then
    # Line 150  abi-m64() Line 151  abi-m64()
    151   export ABI="m64"   export ABI="m64"
    152   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
    153   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
    154   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="${ABI_X86_64_LIBDIR}"
    155   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    156   then   then
    157   local saved_ldflags="${LDFLAGS}"   local saved_ldflags="${LDFLAGS}"
    Legend:
    Removed from v.31854  
    changed lines
      Added in v.33339