mirror of
https://github.com/frida/tinycc
synced 2024-11-25 00:59:37 +03:00
Various fixes for f9ac2013
This commit is contained in:
parent
f9ac201377
commit
a4cbd9b002
10
configure
vendored
10
configure
vendored
@ -261,7 +261,7 @@ if $cc -o $TMPO $TMPC 2> /dev/null ; then
|
||||
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%%/*}"
|
||||
@ -418,6 +418,8 @@ print_var2 CONFIG_TCC_SYSINCLUDEPATHS "$tcc_sysincludepaths"
|
||||
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
|
||||
|
||||
@ -501,12 +503,6 @@ if test "$have_selinux" = "yes" ; then
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user