--- trunk/multiarch-wrapper/multiarch-wrapper.c	2010/08/20 16:14:36	1148
+++ trunk/multiarch-wrapper/multiarch-wrapper.c	2010/08/20 16:59:22	1150
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #ifndef DEF_SUFFIX
-#  define DEF_SUFFIX "64"
+#  define DEF_SUFFIX "m64"
 #endif
 
 int main(int argc, char **argv)
@@ -16,9 +16,8 @@
   char *filename;
   char *suffix;
 
-  if(!(suffix = getenv("USE_ARCH")))
-    if(!(suffix = getenv("BUILDENV")))
-      suffix = DEF_SUFFIX;
+  if(!(suffix = getenv("ABI")))
+    suffix = DEF_SUFFIX;
 
   if (asprintf(&filename, "%s-%s", argv[0], suffix) < 0) {
     perror(argv[0]);