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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild index 72b356e0c534..95b9174eef81 100644 --- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild +++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild @@ -7,7 +7,11 @@ 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 RDEPEND="" DEPEND="${RDEPEND} |