From c325bab3850c69f2580e42e3cc825da795cb0771 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 29 Apr 2016 11:01:57 +0200 Subject: fixup c++ compiler issues the right way --- toolchain/gcc/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'toolchain/gcc/Makefile') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index c4b711a0a..8a4024220 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -15,17 +15,17 @@ endif TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CXXFLAGS:= $(filter-out -flto,$(TARGET_CXXFLAGS)) -ifeq ($(ADK_TARGET_ARCH_XTENSA),y) -TARGET_CFLAGS:= $(filter-out -mtext-section-literals,$(TARGET_CFLAGS)) -TARGET_CXXFLAGS:= $(filter-out -mtext-section-literals,$(TARGET_CXXFLAGS)) -endif - # for uClinux, we need to filter out some flags ifeq ($(ADK_TARGET_UCLINUX),y) TARGET_CFLAGS:= $(filter-out -msep-data,$(TARGET_CFLAGS)) TARGET_CXXFLAGS:= $(filter-out -msep-data,$(TARGET_CXXFLAGS)) endif +ifeq ($(ADK_TOOLCHAIN_WITH_GO),y) +TARGET_CFLAGS+= -lpthread +TARGET_CXXFLAGS+= -lpthread +endif + GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ --with-bugurl="http://www.openadk.org/" \ --build=$(GNU_HOST_NAME) \ @@ -284,8 +284,8 @@ $(WRKBUILD)/.compiled: PATH='$(TARGET_PATH)' \ CC='$(HOST_CC)' \ CXX='$(HOST_CXX)' \ - CFLAGS_FOR_TARGET='$(TARGET_CFLAGS) -lpthread' \ - CXXFLAGS_FOR_TARGET='$(TARGET_CXXFLAGS) -lpthread' \ + CFLAGS_FOR_TARGET='$(TARGET_CFLAGS)' \ + CXXFLAGS_FOR_TARGET='$(TARGET_CXXFLAGS)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ ${GCC_FINAL_CONFOPTS} \ -- cgit v1.2.3