From 9bd6b2b573c646916592a454835651f69afc4109 Mon Sep 17 00:00:00 2001 From: Anders Magnusson Date: Sat, 6 Dec 2014 09:55:29 +0000 Subject: [PATCH] Pull up 1.26 from head. --- os/linux/ccconfig.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/os/linux/ccconfig.h b/os/linux/ccconfig.h index 1e1e7060..8054b114 100644 --- a/os/linux/ccconfig.h +++ b/os/linux/ccconfig.h @@ -1,4 +1,4 @@ -/* $Id: ccconfig.h,v 1.25 2012/12/12 17:45:23 ragge Exp $ */ +/* $Id: ccconfig.h,v 1.25.2.1 2014/12/06 09:55:29 ragge Exp $ */ /* * Copyright (c) 2004 Anders Magnusson (ragge@ludd.luth.se). @@ -47,7 +47,11 @@ #define CPPMDADD { "-D__x86_64__", "-D__x86_64", "-D__amd64__", \ "-D__amd64", "-D__LP64__", "-D_LP64", NULL, } #define DYNLINKER { "-dynamic-linker", "/lib64/ld-linux-x86-64.so.2", NULL } +#ifndef MULTIARCH_PATH #define DEFLIBDIRS { "/usr/lib64/", 0 } +#else +#define DEFLIBDIRS { "/usr/lib64/", "/usr/lib/" MULTIARCH_PATH "/", 0 } +#endif #elif defined(mach_mips) #define CPPMDADD { "-D__mips__", NULL, } #define DYNLINKER { "-dynamic-linker", "/lib/ld.so.1", NULL } -- 2.11.4.GIT