1
# DP: sparc64, s390x - find 32bit system libraries
3
2010-09-25 Matthias Klose <doko@ubuntu.com>
5
* config/sparc/t-linux64 (MULTILIB_OSDIRNAMES): Use ../lib32 as the
6
multilib osdirname if it exists.
7
* config/s390/t-linux64 (MULTILIB_OSDIRNAMES): Likewise.
9
Index: gcc/config/s390/t-linux64
10
===================================================================
11
--- a/src/gcc/config/s390/t-linux64 (revision 164618)
12
+++ b/src/gcc/config/s390/t-linux64 (working copy)
14
+# On Debian, Ubuntu and other derivative distributions, the 32bit libraries
15
+# are found in /lib32 and /usr/lib32, /lib64 and /usr/lib64 are symlinks to
16
+# /lib and /usr/lib, while other distributions install libraries into /lib64
17
+# and /usr/lib64. The LSB does not enforce the use of /lib64 and /usr/lib64,
18
+# it doesn't tell anything about the 32bit libraries on those systems. Set
19
+# MULTILIB_OSDIRNAMES according to what is found on the target.
21
MULTILIB_OPTIONS = m64/m31
22
MULTILIB_DIRNAMES = 64 32
23
-MULTILIB_OSDIRNAMES = ../lib64 ../lib
24
+MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
25
Index: gcc/config/sparc/t-linux64
26
===================================================================
27
--- a/src/gcc/config/sparc/t-linux64 (revision 164618)
28
+++ b/src/gcc/config/sparc/t-linux64 (working copy)
30
# along with GCC; see the file COPYING3. If not see
31
# <http://www.gnu.org/licenses/>.
33
+# On Debian, Ubuntu and other derivative distributions, the 32bit libraries
34
+# are found in /lib32 and /usr/lib32, /lib64 and /usr/lib64 are symlinks to
35
+# /lib and /usr/lib, while other distributions install libraries into /lib64
36
+# and /usr/lib64. The LSB does not enforce the use of /lib64 and /usr/lib64,
37
+# it doesn't tell anything about the 32bit libraries on those systems. Set
38
+# MULTILIB_OSDIRNAMES according to what is found on the target.
40
MULTILIB_OPTIONS = m64/m32
41
MULTILIB_DIRNAMES = 64 32
42
-MULTILIB_OSDIRNAMES = ../lib64 ../lib
43
+MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
45
LIBGCC = stmp-multilib
46
INSTALL_LIBGCC = install-multilib