diff options
Diffstat (limited to 'sys-devel/gcc/gcc-7.4.0-r2.ebuild')
-rw-r--r-- | sys-devel/gcc/gcc-7.4.0-r2.ebuild | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild index 95b9174eef81..62cdb74d516d 100644 --- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild +++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild @@ -7,11 +7,7 @@ PATCH_VER="1.3" inherit toolchain -<<<<<<< HEAD -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" -======= -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" ->>>>>>> next +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos" RDEPEND="" DEPEND="${RDEPEND} |