Unified · Split
| @@ -261,7 +261,7 @@ if $cc -o $TMPO $TMPC 2> /dev/null ; then · 260 unmodified lines | ||
| 261 | 261 | fi |
| 262 | 262 | |
| 263 | 263 | if test -z "$cross_prefix" ; then |
| 264 | − libc_dir="$(ldd ./print_env_info | grep libc.so | sed 's|[^/]*/\(.*/\)[^/]*|\1|')" | |
| 264 | + libc_dir="$(ldd $TMPO | grep libc.so | sed 's|[^/]*/\(.*/\)[^/]*|\1|')" | |
| 265 | 265 | multiarch_triplet=${libc_dir#*/} |
| 266 | 266 | multiarch_triplet=${multiarch_triplet%/} |
| 267 | 267 | lddir="${libc_dir%%/*}" |
| @@ -418,6 +418,8 @@ print_var2 CONFIG_TCC_SYSINCLUDEPATHS "$tcc_sysincludepaths" · 150 unmodified lines | ||
| 418 | 418 | print_var2 CONFIG_TCC_LIBPATHS "$tcc_libpaths" |
| 419 | 419 | print_var2 CONFIG_TCC_CRTPREFIX "$tcc_crtprefix" |
| 420 | 420 | print_var2 CONFIG_TCC_ELFINTERP "$tcc_elfinterp" |
| 421 | +print_var2 CONFIG_MULTIARCHDIR "$multiarch_triplet" | |
| 422 | +print_var2 CONFIG_LDDIR "$lddir" | |
| 421 | 423 | |
| 422 | 424 | echo "#define GCC_MAJOR $gcc_major" >> $TMPH |
| 423 | 425 | |
| @@ -501,12 +503,6 @@ if test "$have_selinux" = "yes" ; then · 77 unmodified lines | ||
| 501 | 503 | echo "#define HAVE_SELINUX" >> $TMPH |
| 502 | 504 | echo "HAVE_SELINUX=yes" >> config.mak |
| 503 | 505 | fi |
| 504 | −if test -n "$multiarch_triplet" ; then | |
| 505 | − echo "#define CONFIG_MULTIARCHDIR \"$multiarch_triplet\"" >> $TMPH | |
| 506 | −fi | |
| 507 | −if test -n "$lddir" ; then | |
| 508 | − echo "#define CONFIG_LDDIR \"$lddir\"" >> $TMPH | |
| 509 | −fi | |
| 510 | 506 | |
| 511 | 507 | version=`head $source_path/VERSION` |
| 512 | 508 | echo "VERSION=$version" >>config.mak |