diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /toolchain/gcc | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index deef63a5c..f82332702 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -42,6 +42,8 @@ endif ifeq ($(ADK_LINUX_X86_64),y) ifeq ($(ADK_x32),y) GCC_CONFOPTS+= --with-multilib-list=mx32 +else +GCC_CONFOPTS+= --disable-biarch --disable-multilib endif endif @@ -57,11 +59,15 @@ else GCC_CONFOPTS+= --disable-lto endif +ifeq ($(ARCH),m68k) +GCC_CONFOPTS+= --disable-tls +else ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +endif ifeq ($(ARCH),powerpc) ifeq ($(ADK_TARGET_LIBC),musl) @@ -189,6 +195,13 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled done; # workaround for openjdk cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin ; cp * .. + # fix linking g++ apps with libtool + @-test -d $(STAGING_TARGET_DIR)/lib32 && \ + cd $(STAGING_TARGET_DIR)/lib32 && \ + ln -sf libstdc++.so.6.0.17 libstdc++.so + @-test -d $(STAGING_TARGET_DIR)/lib64 && \ + cd $(STAGING_TARGET_DIR)/lib64 && \ + ln -sf libstdc++.so.6.0.17 libstdc++.so touch $@ include ${TOPDIR}/mk/toolchain.mk |