Magellan Linux

Diff of /branches/R11-unstable/include/multilib.sminc

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

revision 13972 by niro, Fri Nov 2 10:45:29 2012 UTC revision 13974 by niro, Fri Nov 2 10:54:04 2012 UTC
# Line 98  abi-m32() Line 98  abi-m32()
98   fi   fi
99    
100   # configure a linux32 emulated build   # configure a linux32 emulated build
  local linux32  
101   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
102   then   then
103   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
# Line 107  abi-m32() Line 106  abi-m32()
106   fi   fi
107   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
108   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
  linux32="linux32"  
109   fi   fi
110   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
111   then   then
# Line 115  abi-m32() Line 113  abi-m32()
113   fi   fi
114    
115   # run any given command   # run any given command
116   eval ${linux32} $@ || die   eval $@ || die
117    
118   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
119   # keep pkgconfig clean   # keep pkgconfig clean
# Line 127  abi-m32() Line 125  abi-m32()
125   then   then
126   unset uname   unset uname
127   export CHOST="${orig_chost}" && unset orig_chost   export CHOST="${orig_chost}" && unset orig_chost
  unset linux32  
128   fi   fi
129  }  }
130    

Legend:
Removed from v.13972  
changed lines
  Added in v.13974