aboutsummaryrefslogtreecommitdiff
path: root/tcc.h
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2012-05-23 00:14:15 +0200
committerThomas Preud'homme <robotux@celest.fr>2012-05-23 00:14:15 +0200
commitb56edc7b90631795c246c0220685e139c628ef94 (patch)
tree914f67cb2dbd3971643c5d7344f1e8ccdcde70ef /tcc.h
parenta2c71af1ea750587950121aca3f2a67076b03e07 (diff)
downloadtinycc-b56edc7b90631795c246c0220685e139c628ef94.tar.gz
tinycc-b56edc7b90631795c246c0220685e139c628ef94.tar.bz2
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.
Diffstat (limited to 'tcc.h')
-rw-r--r--tcc.h9
1 files changed, 4 insertions, 5 deletions
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