Mercurial > hg > qcc
changeset 570:c42c2145d359
The dynamic linker location belongs in configure, move it there.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sat, 15 Mar 2008 21:23:24 -0500 |
parents | 2e700c725013 |
children | 45bdc3a391df |
files | configure make/make.sh tccelf.c |
diffstat | 3 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Mar 15 20:10:47 2008 -0500 +++ b/configure Sat Mar 15 21:23:24 2008 -0500 @@ -23,6 +23,8 @@ [ -z "$TINYCC_INSTALLDIR" ] && TINYCC_INSTALLDIR="$PREFIX"/tinycc # Path to search for system #include files. [ -z "$CC_HEADERPATH" ] && CC_HEADERPATH="/usr/include:/usr/local/include" +# Dynamic linker to put into generated executables. +[ -z "$CC_DYNAMIC_LINKER" ] && CC_DYNAMIC_LINKER="/lib/ld-linux.so.2" # CC_LIBPATH is set in make/make.sh because it varies by target (such as # building for i386 on an x86_64 host). You can set CC_LIBPATH here if you
--- a/make/make.sh Sat Mar 15 20:10:47 2008 -0500 +++ b/make/make.sh Sat Mar 15 21:23:24 2008 -0500 @@ -26,7 +26,8 @@ -DTINYCC_INSTALLDIR='"'$TINYCC_INSTALLDIR'"' \ -DCC_CRTDIR='"'$CC_CRTDIR'"' \ -DCC_LIBPATH='"'$CC_LIBPATH'"' \ - -DCC_HEADERPATH='"'$CC_HEADERPATH'"' + -DCC_HEADERPATH='"'$CC_HEADERPATH'"' \ + -DCC_DYNAMIC_LINKER='"'$CC_DYNAMIC_LINKER'"' }
--- a/tccelf.c Sat Mar 15 20:10:47 2008 -0500 +++ b/tccelf.c Sat Mar 15 21:23:24 2008 -0500 @@ -1079,15 +1079,7 @@ } /* name of ELF interpreter */ -#ifdef __FreeBSD__ -static char elf_interp[] = "/usr/libexec/ld-elf.so.1"; -#else -#ifdef TCC_ARM_EABI -static char elf_interp[] = "/lib/ld-linux.so.3"; -#else -static char elf_interp[] = "/lib/ld-linux.so.2"; -#endif -#endif +static char elf_interp[] = CC_DYNAMIC_LINKER; static void tcc_output_binary(TCCState *s1, FILE *f, int *section_order)