summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:34:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:34:13 +0100
commit902ee7e7b23751ca7a8264d36a837aa4aae12032 (patch)
tree56c6b37cd9afd91d176cd75acb77bf32ccd20378 /toolchain
parent3d45df344602687c8983f5fb609721aa8ca2469f (diff)
parent52dbdcd1045c7a8ad96753593540719cff9f8863 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/Config.in4
-rw-r--r--toolchain/gcc/Makefile5
2 files changed, 7 insertions, 2 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 06f0c468a..e86e9656f 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -3,12 +3,12 @@ menu "Toolchain settings"
config ADK_TOOLCHAIN_GDB
prompt "Enable building of the GNU debugger"
boolean
- default n
+ default y
config ADK_TOOLCHAIN_GCC_CXX
prompt "Enable building of G++ (C++ language support in GCC)"
boolean
- default n
+ default y
config ADK_TOOLCHAIN_GCC_JAVA
prompt "Enable building of GCJ (Java language support in GCC)"
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index afb945000..b1ce84f98 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -86,6 +86,11 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final
$(GCC_BUILD_DIR_MINIMAL)/.configured:
mkdir -p $(GCC_BUILD_DIR_MINIMAL)
+ # these symlinks are very important, do not remove
+ rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
+ ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
+ rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib
+ ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib
(cd $(GCC_BUILD_DIR_MINIMAL); \
PATH='$(TARGET_PATH)' \
$(WRKBUILD)/configure \