| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: gcc.mk,v 1.159 2015/04/18 19:53:59 joerg Exp $ | | 1 | # $NetBSD: gcc.mk,v 1.160 2015/04/25 10:33:29 wiz Exp $ |
2 | # | | 2 | # |
3 | # This is the compiler definition for the GNU Compiler Collection. | | 3 | # This is the compiler definition for the GNU Compiler Collection. |
4 | # | | 4 | # |
5 | # User-settable variables: | | 5 | # User-settable variables: |
6 | # | | 6 | # |
7 | # GCCBASE | | 7 | # GCCBASE |
8 | # If using a native GCC and the compiler is not in $PATH then | | 8 | # If using a native GCC and the compiler is not in $PATH then |
9 | # this should be set to the base installation directory. | | 9 | # this should be set to the base installation directory. |
10 | # | | 10 | # |
11 | # USE_NATIVE_GCC | | 11 | # USE_NATIVE_GCC |
12 | # When set to "yes", the native gcc is used, no matter which | | 12 | # When set to "yes", the native gcc is used, no matter which |
13 | # compiler version a package requires. | | 13 | # compiler version a package requires. |
14 | # | | 14 | # |
| @@ -328,36 +328,36 @@ CWRAPPERS_APPEND.cc+= -std=gnu99 | | | @@ -328,36 +328,36 @@ CWRAPPERS_APPEND.cc+= -std=gnu99 |
328 | | | 328 | |
329 | # GCC has this annoying behaviour where it advocates in a multi-line | | 329 | # GCC has this annoying behaviour where it advocates in a multi-line |
330 | # banner the use of "#include" over "#import" when including headers. | | 330 | # banner the use of "#include" over "#import" when including headers. |
331 | # This generates a huge number of warnings when building practically all | | 331 | # This generates a huge number of warnings when building practically all |
332 | # Objective-C code where it is convention to use "#import". Suppress | | 332 | # Objective-C code where it is convention to use "#import". Suppress |
333 | # the warning if we're building Objective-C code using GCC. | | 333 | # the warning if we're building Objective-C code using GCC. |
334 | # | | 334 | # |
335 | .if !empty(_LANGUAGES.gcc:Mobjc) | | 335 | .if !empty(_LANGUAGES.gcc:Mobjc) |
336 | CFLAGS+= -Wno-import | | 336 | CFLAGS+= -Wno-import |
337 | .endif | | 337 | .endif |
338 | | | 338 | |
339 | .if !empty(_NEED_GCC2:M[yY][eE][sS]) | | 339 | .if !empty(_NEED_GCC2:M[yY][eE][sS]) |
340 | # | | 340 | # |
341 | # We require gcc-2.x in the lang/gcc directory. | | 341 | # We require gcc-2.x in the lang/gcc2 directory. |
342 | # | | 342 | # |
343 | _GCC_PKGBASE= gcc | | 343 | _GCC_PKGBASE= gcc2 |
344 | . if !empty(PKGPATH:Mlang/gcc) | | 344 | . if !empty(PKGPATH:Mlang/gcc2) |
345 | _IGNORE_GCC= yes | | 345 | _IGNORE_GCC= yes |
346 | MAKEFLAGS+= _IGNORE_GCC=yes | | 346 | MAKEFLAGS+= _IGNORE_GCC=yes |
347 | . endif | | 347 | . endif |
348 | . if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) | | 348 | . if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) |
349 | _GCC_PKGSRCDIR= ../../lang/gcc | | 349 | _GCC_PKGSRCDIR= ../../lang/gcc2 |
350 | _GCC_DEPENDENCY= gcc>=${_GCC_REQD}:../../lang/gcc | | 350 | _GCC_DEPENDENCY= gcc2>=${_GCC_REQD}:../../lang/gcc2 |
351 | . if !empty(_LANGUAGES.gcc:Mc++) || \ | | 351 | . if !empty(_LANGUAGES.gcc:Mc++) || \ |
352 | !empty(_LANGUAGES.gcc:Mfortran77) || \ | | 352 | !empty(_LANGUAGES.gcc:Mfortran77) || \ |
353 | !empty(_LANGUAGES.gcc:Mobjc) | | 353 | !empty(_LANGUAGES.gcc:Mobjc) |
354 | _USE_GCC_SHLIB?= yes | | 354 | _USE_GCC_SHLIB?= yes |
355 | . endif | | 355 | . endif |
356 | . endif | | 356 | . endif |
357 | .elif !empty(_NEED_GCC3:M[yY][eE][sS]) | | 357 | .elif !empty(_NEED_GCC3:M[yY][eE][sS]) |
358 | # | | 358 | # |
359 | # We require gcc-3.x in the lang/gcc3-* directories. | | 359 | # We require gcc-3.x in the lang/gcc3-* directories. |
360 | # | | 360 | # |
361 | _GCC_PKGBASE= gcc3-c | | 361 | _GCC_PKGBASE= gcc3-c |
362 | . if !empty(PKGPATH:Mlang/gcc3-c) | | 362 | . if !empty(PKGPATH:Mlang/gcc3-c) |
363 | _IGNORE_GCC= yes | | 363 | _IGNORE_GCC= yes |