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 31851 by niro, Tue Dec 18 13:15:14 2018 UTC revision 31852 by niro, Thu Dec 20 13:40:54 2018 UTC
    # Line 82  abi-m32() Line 82  abi-m32()
    82   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    83   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    84    
    85     # honor rust
    86     case ${ARCH} in
    87     # use native abi as RUST_TARGET
    88     i686) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    89     # use i686 as RUST_TARGET for i{3,4,5}86 targets and on multilib-x86_64 target too
    90     i*86|x86_64) export RUST_TARGET="i686-unknown-linux-gnu" ;;
    91     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    92     esac
    93    
    94   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    95   then   then
    96   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    # Line 122  abi-m32() Line 131  abi-m32()
    131   fi   fi
    132   eval $@ || die   eval $@ || die
    133    
    134   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    135   # keep pkgconfig clean   # keep pkgconfig clean
    136   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    137   export LDFLAGS="${saved_ldflags}"   export LDFLAGS="${saved_ldflags}"
    # Line 150  abi-m64() Line 159  abi-m64()
    159   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    160   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    161    
    162     # honor rust
    163     case ${ARCH} in
    164     # use native abi as RUST_TARGET
    165     x86_64) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    166     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    167     esac
    168    
    169   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    170   then   then
    171   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    # Line 175  abi-m64() Line 191  abi-m64()
    191   fi   fi
    192   eval $@ || die   eval $@ || die
    193    
    194   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    195   # keep pkgconfig clean   # keep pkgconfig clean
    196   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    197   export LDFLAGS="${saved_ldflags}"   export LDFLAGS="${saved_ldflags}"
    Legend:
    Removed from v.31851  
    changed lines
      Added in v.31852