diff --git a/Makefile b/Makefile
index fe5dea9a..60aabbd9 100644
--- a/Makefile
+++ b/Makefile
@@ -37,13 +37,14 @@ endif
 
 ifeq ($(ARCH),i386)
 NATIVE_DEFINES=-DTCC_TARGET_I386 
+NATIVE_DEFINES+=$(if $(wildcard /lib/i386-linux-gnu),-DCONFIG_MULTIARCHDIR=\"i386-linux-gnu\")
 CFLAGS+=-m32
 else
 ifeq ($(ARCH),x86-64)
 NATIVE_DEFINES=-DTCC_TARGET_X86_64
 CFLAGS+=-m64
-NATIVE_DEFINES+=$(if $(wildcard /lib64/ld-linux-x86-64.so.2),-DCONFIG_LDDIR=\"lib64\")
-NATIVE_DEFINES+=$(if $(wildcard /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2),-DCONFIG_MULTIARCHDIR=\"x86_64-linux-gnu\")
+NATIVE_DEFINES+=$(if $(wildcard /usr/lib64),-DCONFIG_LDDIR=\"lib64\")
+NATIVE_DEFINES+=$(if $(wildcard /lib/x86_64-linux-gnu),-DCONFIG_MULTIARCHDIR=\"x86_64-linux-gnu\")
 endif
 endif
 
@@ -51,6 +52,7 @@ ifeq ($(ARCH),arm)
 NATIVE_DEFINES=-DTCC_TARGET_ARM
 NATIVE_DEFINES+=-DWITHOUT_LIBTCC
 NATIVE_DEFINES+=$(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI)
+NATIVE_DEFINES+=$(if $(wildcard /lib/arm-linux-gnueabi),-DCONFIG_MULTIARCHDIR=\"arm-linux-gnueabi\")
 NATIVE_DEFINES+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP)
 endif
 
diff --git a/tcc.h b/tcc.h
index 029d52b7..a53dd78f 100644
--- a/tcc.h
+++ b/tcc.h
@@ -152,13 +152,12 @@
 # define CONFIG_SYSROOT ""
 #endif
 
-#ifndef CONFIG_LDDIR
-# define CONFIG_LDDIR "lib"
+#ifdef CONFIG_MULTIARCHDIR
+# define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR
 #endif
 
-#ifdef CONFIG_MULTIARCHDIR
-# undef CONFIG_LDDIR
-# define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR
+#ifndef CONFIG_LDDIR
+# define CONFIG_LDDIR "lib"
 #endif
 
 /* path to find crt1.o, crti.o and crtn.o */