summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-09-21 10:45:46 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-09-21 10:45:46 +0200
commit78cb368c1f1fd69551be74da3f1c6698f35dc68a (patch)
tree01a6b6e346e4a17be13d9e5c494913fc58d63f79
parentbf5cbe6a5ad0d031d00e10ecbf8615a52eb65342 (diff)
parent65f1e3e013469022dcd556a27580eef645523cfb (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/gdb/Makefile4
2 files changed, 5 insertions, 1 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 5180e6ede..946c85b18 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -39,7 +39,7 @@ BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
-C ${WRKBUILD}
ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-ltirpc' EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/tirpc"
+BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-pthread -ltirpc' EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/tirpc"
endif
# XXX: Although this looks like all new symbols are enabled when 'make oldconfig' runs, they're not.
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 223d603d8..5bc8d6de2 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -16,6 +16,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+#ifeq ($(ADK_STATIC),y)
+#TARGET_CFLAGS+= -static
+#endif
+
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= ${TARGET_CPPFLAGS} -fPIC
CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \