Magellan Linux

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

    Diff of /smage/trunk/include/multilib.sminc

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

    revision 13784 by niro, Wed Oct 30 13:18:04 2019 UTC revision 16198 by niro, Tue Sep 19 11:26:30 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     [[ ${MABI} = m32 ]] && libdir="${ABI_X86_LIBDIR}"
    64     [[ ${MABI} = m64 ]] && libdir="${ABI_X86_64_LIBDIR}"
    65   [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"   [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"
    66    
    67   echo "${libdir}"   echo "${libdir}"
    # Line 72  abi-m32() Line 75  abi-m32()
    75   export ABI="m32"   export ABI="m32"
    76   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
    77   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
    78   export ABI_LIBDIR="lib"   export ABI_LIBDIR="${ABI_X86_LIBDIR}"
    79   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    80   then   then
    81   local saved_ldflags="${LDFLAGS}"   local saved_ldflags="${LDFLAGS}"
    # Line 118  abi-m32() Line 121  abi-m32()
    121   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    122   fi   fi
    123   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    124   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="${ABI_X86_CHOST}"
    125   fi   fi
    126   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    127   then   then
    # Line 150  abi-m64() Line 153  abi-m64()
    153   export ABI="m64"   export ABI="m64"
    154   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
    155   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
    156   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="${ABI_X86_64_LIBDIR}"
    157   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    158   then   then
    159   local saved_ldflags="${LDFLAGS}"   local saved_ldflags="${LDFLAGS}"
    Legend:
    Removed from v.13784  
    changed lines
      Added in v.16198