summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-31 17:35:18 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-31 17:35:18 -0500
commit829a0ca9fa62ef1e003594ff9e8c8b909a94cfcb (patch)
tree1696cd9000feeb8353e5087e00fb85ebdccd23dd
parent977e95a39bf55805b5b3cb770ba9483939dd4087 (diff)
better handling for no-thread compiles of toolchain
-rw-r--r--target/config/Config.in.libc.choice1
-rw-r--r--toolchain/gcc/Makefile5
2 files changed, 2 insertions, 4 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 5e18b392b..5645e6e44 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -115,6 +115,7 @@ prompt "Threading"
depends on ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG
config ADK_TARGET_LIB_WITH_THREADS
+ depends on ADK_TARGET_WITH_LT || ADK_TARGET_WITH_NPTL
bool "enable threads"
config ADK_TARGET_LIB_WITHOUT_THREADS
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index cbbc41e6b..e3974ff31 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -23,7 +23,6 @@ TARGET_CFLAGS:= $(filter-out -msep-data,$(TARGET_CFLAGS))
TARGET_CXXFLAGS:= $(filter-out -msep-data,$(TARGET_CXXFLAGS))
endif
-
GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \
--with-bugurl="http://www.openadk.org/" \
--build=$(GNU_HOST_NAME) \
@@ -60,9 +59,7 @@ GCC_CONFOPTS+= --enable-tls --enable-threads --enable-libatomic
else
GCC_CONFOPTS+= --disable-tls --disable-threads --disable-libatomic
endif
-endif
-
-ifeq ($(ADK_TARGET_WITH_LT),y)
+else
GCC_CONFOPTS+= --disable-tls --disable-threads --disable-libatomic
endif