Various fixes for f9ac2013

Thomas Preud'homme committed 13 years ago

Commit a4cbd9b1 parent f9ac2011 file · +3 −7Browse files

Unified · Split

 fi
 if test -z "$cross_prefix" ; then
- libc_dir="$(ldd ./print_env_info | grep libc.so | sed 's|[^/]*/\(.*/\)[^/]*|\1|')"
+ libc_dir="$(ldd $TMPO | grep libc.so | sed 's|[^/]*/\(.*/\)[^/]*|\1|')"
  multiarch_triplet=${libc_dir#*/}
  multiarch_triplet=${multiarch_triplet%/}
  lddir="${libc_dir%%/*}"
 print_var2 CONFIG_TCC_LIBPATHS "$tcc_libpaths"
 print_var2 CONFIG_TCC_CRTPREFIX "$tcc_crtprefix"
 print_var2 CONFIG_TCC_ELFINTERP "$tcc_elfinterp"
+print_var2 CONFIG_MULTIARCHDIR "$multiarch_triplet"
+print_var2 CONFIG_LDDIR "$lddir"
 echo "#define GCC_MAJOR $gcc_major" >> $TMPH
   echo "#define HAVE_SELINUX" >> $TMPH
   echo "HAVE_SELINUX=yes" >> config.mak
 fi
-if test -n "$multiarch_triplet" ; then
-  echo "#define CONFIG_MULTIARCHDIR \"$multiarch_triplet\"" >> $TMPH
-fi
-if test -n "$lddir" ; then
-  echo "#define CONFIG_LDDIR \"$lddir\"" >> $TMPH
-fi
 version=`head $source_path/VERSION`
 echo "VERSION=$version" >>config.mak

Keyboard shortcuts