summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-01-15 11:01:37 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-01-15 11:01:37 +0000
commit3800e330165e575d68d17ec889cfb4b97d78e905 (patch)
treee47cb83e5bfb9addf3b77ff2e9a2cafd02b3fcd4
parent0f92b0198868ac15fa6d3ece5acabe2d8d427072 (diff)
Minor cleanup.
-rw-r--r--make/libfloat.mk5
-rw-r--r--make/uclibc.mk7
2 files changed, 5 insertions, 7 deletions
diff --git a/make/libfloat.mk b/make/libfloat.mk
index 97e1be1b5..dffef3de5 100644
--- a/make/libfloat.mk
+++ b/make/libfloat.mk
@@ -10,7 +10,7 @@ LIBFLOAT_CAT:=zcat
LIBFLOAT_DIR:=$(BUILD_DIR)/libfloat
LIBFLOAT_TARGET=
-ifneq ("$(strip $(TARGET_SOFT_FLOAT))","")
+ifeq ($(strip $(SOFT_FLOAT)),true)
ifeq ("$(strip $(ARCH))","arm")
LIBFLOAT_TARGET+=$(STAGING_DIR)/lib/libfloat.so
endif
@@ -32,8 +32,7 @@ $(LIBFLOAT_DIR)/.unpacked: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PAT
$(SOURCE_DIR)/patch-kernel.sh $(LIBFLOAT_DIR) $(SOURCE_DIR) libfloat.patch
touch $(LIBFLOAT_DIR)/.unpacked
-$(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked \
- $(STAGING_DIR)/bin/$(ARCH)-linux-gcc
+$(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked $(TARGET_CC)
$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld -C $(LIBFLOAT_DIR)
$(STAGING_DIR)/lib/libfloat.so: $(LIBFLOAT_DIR)/libfloat.so.1
diff --git a/make/uclibc.mk b/make/uclibc.mk
index b5059c364..7bdad88a9 100644
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -63,10 +63,9 @@ else
$(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.config
endif
$(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
- if [ -n "$(strip $(TARGET_SOFT_FLOAT))" ] ; then \
- $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' \
- $(UCLIBC_DIR)/.config; \
- fi
+ifeq ($(strip $(SOFT_FLOAT)),true)
+ $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config
+endif
$(MAKE) -C $(UCLIBC_DIR) \
PREFIX=$(STAGING_DIR)/ \
DEVEL_PREFIX=$(REAL_GNU_TARGET_NAME)/ \