diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
| commit | 070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch) | |
| tree | 1a4cf65e381c5ce777316fb67e69018feb741f8f /package/gcc | |
| parent | d82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff) | |
| parent | 644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff) | |
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/build.mk
Diffstat (limited to 'package/gcc')
| -rw-r--r-- | package/gcc/Config.in | 1 | ||||
| -rw-r--r-- | package/gcc/Makefile | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/package/gcc/Config.in b/package/gcc/Config.in index be3446b96..5cc23e6ca 100644 --- a/package/gcc/Config.in +++ b/package/gcc/Config.in @@ -4,6 +4,7 @@ config ADK_PACKAGE_GCC default n select ADK_PACKAGE_LIBGMP select ADK_PACKAGE_MPFR + depends on !ADK_HOST_FREEBSD help GCC http://www.gnu.org/gcc diff --git a/package/gcc/Makefile b/package/gcc/Makefile index b2f6266ef..0e6384a5b 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -35,9 +35,7 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \ --disable-multilib \ --disable-libstdcxx-pch BUILD_STYLE:= auto -#ALL_TARGET:= all-gcc all-target-libgcc INSTALL_STYLE:= auto -#INSTALL_TARGET:= install-gcc install-target-libgcc post-install: ${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin |