From b56edc7b90631795c246c0220685e139c628ef94 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Wed, 23 May 2012 00:14:15 +0200 Subject: Several multiarch/biarch fixes * Add multiarch directories for arm and i386 * Fix detection of biarch: /lib64/ld-linux-x86-64.so.2 is mandated by ABI and is thus always present, even if there is no biarch * Define CONFIG_LDDIR directly with the right value in case of multiarch instead of defining it to /lib and then redifining it. --- tcc.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tcc.h') diff --git a/tcc.h b/tcc.h index 029d52b..a53dd78 100644 --- a/tcc.h +++ b/tcc.h @@ -152,15 +152,14 @@ # define CONFIG_SYSROOT "" #endif -#ifndef CONFIG_LDDIR -# define CONFIG_LDDIR "lib" -#endif - #ifdef CONFIG_MULTIARCHDIR -# undef CONFIG_LDDIR # define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR #endif +#ifndef CONFIG_LDDIR +# define CONFIG_LDDIR "lib" +#endif + /* path to find crt1.o, crti.o and crtn.o */ #ifndef CONFIG_TCC_CRTPREFIX # define CONFIG_TCC_CRTPREFIX CONFIG_SYSROOT "/usr/" CONFIG_LDDIR -- cgit v1.3.1