1
--- a/src/boehm-gc/configure.ac
2
+++ b/src/boehm-gc/configure.ac
4
AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory])
7
-if test -n "$with_cross_host" &&
8
- test x"$with_cross_host" != x"no"; then
9
- toolexecdir='$(exec_prefix)/$(target_noncanonical)'
10
- toolexeclibdir='$(toolexecdir)/lib'
12
- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
13
- toolexeclibdir='$(libdir)'
15
+toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
16
+toolexeclibdir='$(libdir)'
17
multi_os_directory=`$CC -print-multi-os-directory`
18
case $multi_os_directory in
19
.) ;; # Avoid trailing /.
20
--- a/src/libada/configure.ac
21
+++ b/src/libada/configure.ac
23
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
26
- if test -n "$with_cross_host" &&
27
- test x"$with_cross_host" != x"no"; then
28
- # Install a library built with a cross compiler in tooldir, not libdir.
29
- toolexecdir='$(exec_prefix)/$(target_alias)'
30
- toolexeclibdir='$(toolexecdir)/lib'
32
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
33
- toolexeclibdir='$(libdir)'
35
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
36
+ toolexeclibdir='$(libdir)'
37
multi_os_directory=`$CC -print-multi-os-directory`
38
case $multi_os_directory in
39
.) ;; # Avoid trailing /.
40
--- a/src/libffi/configure.ac
41
+++ b/src/libffi/configure.ac
43
AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
46
-if test -n "$with_cross_host" &&
47
- test x"$with_cross_host" != x"no"; then
48
- toolexecdir='$(exec_prefix)/$(target_alias)'
49
- toolexeclibdir='$(toolexecdir)/lib'
51
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
52
- toolexeclibdir='$(libdir)'
54
+toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
55
+toolexeclibdir='$(libdir)'
57
multi_os_directory=`$CC -print-multi-os-directory`
58
case $multi_os_directory in
59
.) ;; # Avoid trailing /.
60
--- a/src/libgcc/configure.ac
61
+++ b/src/libgcc/configure.ac
63
slibdir="$with_slibdir",
64
if test "${version_specific_libs}" = yes; then
65
slibdir='$(libsubdir)'
66
-elif test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
67
- slibdir='$(exec_prefix)/$(host_noncanonical)/lib'
72
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
75
- if test -n "$with_cross_host" &&
76
- test x"$with_cross_host" != x"no"; then
77
- # Install a library built with a cross compiler in tooldir, not libdir.
78
- toolexecdir='$(exec_prefix)/$(target_noncanonical)'
79
- toolexeclibdir='$(toolexecdir)/lib'
81
- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
82
- toolexeclibdir='$(libdir)'
84
+ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
85
+ toolexeclibdir='$(libdir)'
86
multi_os_directory=`$CC -print-multi-os-directory`
87
case $multi_os_directory in
88
.) ;; # Avoid trailing /.
89
--- a/src/libgfortran/configure.ac
90
+++ b/src/libgfortran/configure.ac
92
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
95
- if test -n "$with_cross_host" &&
96
- test x"$with_cross_host" != x"no"; then
97
- # Install a library built with a cross compiler in tooldir, not libdir.
98
- toolexecdir='$(exec_prefix)/$(target_alias)'
99
- toolexeclibdir='$(toolexecdir)/lib'
101
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
102
- toolexeclibdir='$(libdir)'
104
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
105
+ toolexeclibdir='$(libdir)'
106
multi_os_directory=`$CC -print-multi-os-directory`
107
case $multi_os_directory in
108
.) ;; # Avoid trailing /.
109
--- a/src/libgo/configure.ac
110
+++ b/src/libgo/configure.ac
113
# Calculate glibgo_toolexecdir, glibgo_toolexeclibdir
114
# Install a library built with a cross compiler in tooldir, not libdir.
115
-if test -n "$with_cross_host" &&
116
- test x"$with_cross_host" != x"no"; then
117
- nover_glibgo_toolexecdir='${exec_prefix}/${host_alias}'
118
- nover_glibgo_toolexeclibdir='${toolexecdir}/lib'
120
- nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}'
121
- nover_glibgo_toolexeclibdir='${libdir}'
123
+nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}'
124
+nover_glibgo_toolexeclibdir='${libdir}'
125
multi_os_directory=`$CC -print-multi-os-directory`
126
case $multi_os_directory in
127
.) ;; # Avoid trailing /.
128
--- a/src/libgomp/configure.ac
129
+++ b/src/libgomp/configure.ac
131
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
134
- if test -n "$with_cross_host" &&
135
- test x"$with_cross_host" != x"no"; then
136
- # Install a library built with a cross compiler in tooldir, not libdir.
137
- toolexecdir='$(exec_prefix)/$(target_alias)'
138
- toolexeclibdir='$(toolexecdir)/lib'
140
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
141
- toolexeclibdir='$(libdir)'
143
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
144
+ toolexeclibdir='$(libdir)'
145
multi_os_directory=`$CC -print-multi-os-directory`
146
case $multi_os_directory in
147
.) ;; # Avoid trailing /.
148
--- a/src/libitm/configure.ac
149
+++ b/src/libitm/configure.ac
151
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
154
- if test -n "$with_cross_host" &&
155
- test x"$with_cross_host" != x"no"; then
156
- # Install a library built with a cross compiler in tooldir, not libdir.
157
- toolexecdir='$(exec_prefix)/$(target_alias)'
158
- toolexeclibdir='$(toolexecdir)/lib'
160
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
161
- toolexeclibdir='$(libdir)'
163
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
164
+ toolexeclibdir='$(libdir)'
165
multi_os_directory=`$CC -print-multi-os-directory`
166
case $multi_os_directory in
167
.) ;; # Avoid trailing /.
168
--- a/src/libjava/configure.ac
169
+++ b/src/libjava/configure.ac
170
@@ -1566,15 +1566,8 @@
171
toolexeclibdir=$toolexecmainlibdir
174
- if test -n "$with_cross_host" &&
175
- test x"$with_cross_host" != x"no"; then
176
- # Install a library built with a cross compiler in tooldir, not libdir.
177
- toolexecdir='$(exec_prefix)/$(target_noncanonical)'
178
- toolexecmainlibdir='$(toolexecdir)/lib'
180
- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
181
- toolexecmainlibdir='$(libdir)'
183
+ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
184
+ toolexecmainlibdir='$(libdir)'
185
multi_os_directory=`$CC -print-multi-os-directory`
186
case $multi_os_directory in
187
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
188
--- a/src/libmudflap/configure.ac
189
+++ b/src/libmudflap/configure.ac
191
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
194
- if test -n "$with_cross_host" &&
195
- test x"$with_cross_host" != x"no"; then
196
- # Install a library built with a cross compiler in tooldir, not libdir.
197
- toolexecdir='$(exec_prefix)/$(target_alias)'
198
- toolexeclibdir='$(toolexecdir)/lib'
200
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
201
- toolexeclibdir='$(libdir)'
203
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
204
+ toolexeclibdir='$(libdir)'
205
multi_os_directory=`$CC -print-multi-os-directory`
206
case $multi_os_directory in
207
.) ;; # Avoid trailing /.
208
--- a/src/libobjc/configure.ac
209
+++ b/src/libobjc/configure.ac
211
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
214
- if test -n "$with_cross_host" &&
215
- test x"$with_cross_host" != x"no"; then
216
- # Install a library built with a cross compiler in tooldir, not libdir.
217
- toolexecdir='$(exec_prefix)/$(target_noncanonical)'
218
- toolexeclibdir='$(toolexecdir)/lib'
220
- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
221
- toolexeclibdir='$(libdir)'
223
+ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
224
+ toolexeclibdir='$(libdir)'
225
multi_os_directory=`$CC -print-multi-os-directory`
226
case $multi_os_directory in
227
.) ;; # Avoid trailing /.
228
--- a/src/libquadmath/configure.ac
229
+++ b/src/libquadmath/configure.ac
231
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
234
- if test -n "$with_cross_host" &&
235
- test x"$with_cross_host" != x"no"; then
236
- # Install a library built with a cross compiler in tooldir, not libdir.
237
- toolexecdir='$(exec_prefix)/$(target_alias)'
238
- toolexeclibdir='$(toolexecdir)/lib'
240
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
241
- toolexeclibdir='$(libdir)'
243
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
244
+ toolexeclibdir='$(libdir)'
245
multi_os_directory=`$CC -print-multi-os-directory`
246
case $multi_os_directory in
247
.) ;; # Avoid trailing /.
248
--- a/src/libssp/configure.ac
249
+++ b/src/libssp/configure.ac
251
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
254
- if test -n "$with_cross_host" &&
255
- test x"$with_cross_host" != x"no"; then
256
- # Install a library built with a cross compiler in tooldir, not libdir.
257
- toolexecdir='$(exec_prefix)/$(target_alias)'
258
- toolexeclibdir='$(toolexecdir)/lib'
260
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
261
- toolexeclibdir='$(libdir)'
263
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
264
+ toolexeclibdir='$(libdir)'
265
multi_os_directory=`$CC -print-multi-os-directory`
266
case $multi_os_directory in
267
.) ;; # Avoid trailing /.
268
--- a/src/libstdc++-v3/acinclude.m4
269
+++ b/src/libstdc++-v3/acinclude.m4
271
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
272
# Install a library built with a cross compiler in tooldir, not libdir.
273
if test x"$glibcxx_toolexecdir" = x"no"; then
274
- if test -n "$with_cross_host" &&
275
- test x"$with_cross_host" != x"no"; then
276
- glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
277
- glibcxx_toolexeclibdir='${toolexecdir}/lib'
279
- glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
280
- glibcxx_toolexeclibdir='${libdir}'
282
+ glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
283
+ glibcxx_toolexeclibdir='${libdir}'
284
multi_os_directory=`$CXX -print-multi-os-directory`
285
case $multi_os_directory in
286
.) ;; # Avoid trailing /.
287
--- a/src/zlib/configure.ac
288
+++ b/src/zlib/configure.ac
291
AC_CHECK_HEADERS(unistd.h)
293
-if test -n "$with_cross_host" &&
294
- test x"$with_cross_host" != x"no"; then
295
- toolexecdir='$(exec_prefix)/$(target_alias)'
296
- toolexeclibdir='$(toolexecdir)/lib'
298
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
299
- toolexeclibdir='$(libdir)'
301
+toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
302
+toolexeclibdir='$(libdir)'
304
if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
305
multiosdir=/`$CC -print-multi-os-directory`
307
--- a/src/libatomic/configure.ac
308
+++ b/src/libatomic/configure.ac
310
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
313
- if test -n "$with_cross_host" &&
314
- test x"$with_cross_host" != x"no"; then
315
- # Install a library built with a cross compiler in tooldir, not libdir.
316
- toolexecdir='$(exec_prefix)/$(target_alias)'
317
- toolexeclibdir='$(toolexecdir)/lib'
319
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
320
- toolexeclibdir='$(libdir)'
322
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
323
+ toolexeclibdir='$(libdir)'
324
multi_os_directory=`$CC -print-multi-os-directory`
325
case $multi_os_directory in
326
.) ;; # Avoid trailing /.
327
--- a/src/libsanitizer/configure.ac
328
+++ b/src/libsanitizer/configure.ac
330
toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
333
- if test -n "$with_cross_host" &&
334
- test x"$with_cross_host" != x"no"; then
335
- # Install a library built with a cross compiler in tooldir, not libdir.
336
- toolexecdir='$(exec_prefix)/$(target_alias)'
337
- toolexeclibdir='$(toolexecdir)/lib'
339
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
340
- toolexeclibdir='$(libdir)'
342
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
343
+ toolexeclibdir='$(libdir)'
344
multi_os_directory=`$CC -print-multi-os-directory`
345
case $multi_os_directory in
346
.) ;; # Avoid trailing /.