From: Khem Raj <raj.khem@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/3] uclibc.mk: Make all available versions of uclibc compilable with new toolchain build sequence.
Date: Wed, 28 Jul 2010 00:11:38 -0700 [thread overview]
Message-ID: <1280301099-5930-3-git-send-email-raj.khem@gmail.com> (raw)
In-Reply-To: <1280301099-5930-1-git-send-email-raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
toolchain/uClibc/uclibc.mk | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 016f323..fa55860 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -386,6 +386,16 @@ ifeq ($(BR2_x86_core2),y)
$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
endif
endif
+ifeq ($(BR2_UCLIBC_VERSION_0_9_28_3),y)
+UCLIBC_INITIAL_TARGETS=libc/sysdeps/linux/$(UCLIBC_TARGET_ARCH)/crti.o \
+ libc/sysdeps/linux/$(UCLIBC_TARGET_ARCH)/crtn.o \
+ libc/sysdeps/linux/$(UCLIBC_TARGET_ARCH)/crt1.o \
+ pregen install_dev
+CP_CRT_FILES=cp -pLR $(UCLIBC_DIR)/libc/sysdeps/linux/$(UCLIBC_TARGET_ARCH)/crt[1in].o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/
+else
+UCLIBC_INITIAL_TARGETS=lib/crt1.o lib/crti.o lib/crtn.o install_headers
+CP_CRT_FILES=cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/
+endif
$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config
@@ -407,9 +417,8 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
- HOSTCC="$(HOSTCC)" headers \
- lib/crt1.o lib/crti.o lib/crtn.o \
- $(if $(BR2_UCLIBC_VERSION_0_9_28_3),install_dev,install_headers)
+ HOSTCC="$(HOSTCC)" \
+ $(UCLIBC_INITIAL_TARGETS)
# Install the kernel headers to the first stage gcc include dir
# if necessary
if [ ! -f $(TOOLCHAIN_DIR)/uClibc_dev/usr/include/linux/version.h ]; then \
@@ -418,7 +427,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
fi
$(TARGET_CROSS)gcc -nostdlib -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libc.so
$(TARGET_CROSS)gcc -nostdlib -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libm.so
- cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/
+ $(CP_CRT_FILES)
touch $@
$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate) $(LIBFLOAT_TARGET)
--
1.7.0.4
next prev parent reply other threads:[~2010-07-28 7:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-28 7:11 [Buildroot] [PATCH 0/3] Add support for uclibc NPTL toolchain Khem Raj
2010-07-28 7:11 ` [Buildroot] [PATCH 1/3] " Khem Raj
2010-07-28 7:11 ` Khem Raj [this message]
2010-07-28 7:11 ` [Buildroot] [PATCH 3/3] gcc-4.2.4: Add patch to accept --with-abi=aapcs-linux Khem Raj
2010-07-29 15:36 ` [Buildroot] [PATCH 0/3] Add support for uclibc NPTL toolchain Peter Korsgaard
2010-07-29 17:02 ` Khem Raj
2010-07-29 19:10 ` Peter Korsgaard
2010-07-30 2:12 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280301099-5930-3-git-send-email-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox