diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-04-02 23:21:01 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-04-02 23:21:01 +0000 |
| commit | 90121fb4ce7f8c347d3d29bdee2ae5cbc7d0dee2 (patch) | |
| tree | d9063b83e0456751c6e6cf2d8e8884b3d1a70fa6 | |
| parent | a4f4847e612e3db5a5fc0828745d2357300ca8cc (diff) | |
| download | pkgsrc-90121fb4ce7f8c347d3d29bdee2ae5cbc7d0dee2.tar.gz | |
Don't recompute _GCC_PREFIX and _GCC_SUBPREFIX in the general case. At
best this does nothing, and at worst it is actively harmful when using
multilib systems. It's possible the mips case is broken too, but I do
not have any hardware to test that on, so for now leave the special mips
MABIFLAG handling intact.
Fixes multilib SunOS builds.
| -rw-r--r-- | mk/compiler/gcc.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index a03084b2e76..ca7d614d9f9 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.155 2015/02/04 14:11:50 jperkin Exp $ +# $NetBSD: gcc.mk,v 1.156 2015/04/02 23:21:01 jperkin Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -668,9 +668,6 @@ _GCC_ARCHDIR!= \ . if defined(MABIFLAG) && !empty(MABIFLAG) _GCC_PREFIX:= ${_GCC_ARCHDIR:H:H:H:H:H}/ _GCC_SUBPREFIX:= ${_GCC_ARCHDIR:H:H:H:H:H:T}/ -. else -_GCC_PREFIX:= ${_GCC_ARCHDIR:H:H:H:H}/ -_GCC_SUBPREFIX:= ${_GCC_ARCHDIR:H:H:H:H:T}/ . endif . endif _GCC_LIBDIRS= ${_GCC_ARCHDIR} ${_GCC_PREFIX}lib |