diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:19:21 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:20:13 +0100 |
commit | 739d512289d14ade82e9fbae7f4371e65989622f (patch) | |
tree | 66c17c7e39a041169e08ea7137f072e3b65ab945 /toolchain | |
parent | d47894abb5304cf3bb30b3669e596d648b5277ba (diff) |
add three library methods, static, shared or both
Rename the static symbol and add the choice to a more
visible place for users.
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/gcc/Makefile | 2 | ||||
-rw-r--r-- | toolchain/uclibc-ng/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 4faa1378c..21c58100d 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -68,7 +68,7 @@ GCC_FINAL_CONFOPTS:= --disable-tls --disable-threads --disable-libatomic GCC_TLS_CONFOPTS:= --disable-tls endif -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_DSBT),y) +ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_BINFMT_DSBT),y) GCC_FINAL_CONFOPTS+= --disable-shared else GCC_FINAL_CONFOPTS+= --enable-shared --enable-cxx-flags='-fPIC' diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index d26ea41e0..1b5c45ff1 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -128,7 +128,7 @@ ifeq ($(ADK_TARGET_LIB_WITHOUT_THREADS)$(ADK_TARGET_WITHOUT_THREADS),y) $(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(HAS_NO_THREADS\).*/\1=y/' ${WRKBUILD}/.config endif -ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_BINFMT_FLAT),) $(SED) 's/.*\(HAVE_SHARED\).*/\1=y/' ${WRKBUILD}/.config else $(SED) 's/.*\(HAVE_SHARED\).*/# \1 is not set/' ${WRKBUILD}/.config |