diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/gcc | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/gcc')
-rw-r--r-- | package/gcc/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/gcc/Makefile b/package/gcc/Makefile index b0d3194e8..1b8104658 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -5,14 +5,14 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/gcc/Makefile.inc PKG_NAME:= gcc -PKG_DESCR:= GNU C compiler -PKG_SECTION:= lang +PKG_DESCR:= c compiler +PKG_SECTION:= dev/lang PKG_OPTS:= noremove PKG_DEPENDS:= libmpc libgmp mpfr PKG_BUILDDEP:= libmpc gmp mpfr PKG_SUBPKGS:= GCC GXX -PKGSD_GXX:= GNU C++ compiler +PKGSD_GXX:= c++ compiler WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj |