summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-05-14 22:02:36 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-05-14 22:02:36 +0000
commit8fa4da7fc09e56e3fd3fe7aed9a802f0fdeeeea0 (patch)
tree5e89cb1e5eea3ea2433cf88e4685887c9efe3c15
parentfcb56ce4a88ec5f41f8213d3d05402a9f603993a (diff)
Top-level makefile fix for OS agnosticism and set the value of TARGET_ARCH
using grep because the '.config' will not get included if we are doing a 'clean' or other targets. This was preventing the proper cleaning up target architecture include files.
-rw-r--r--Makefile2
-rw-r--r--Rules.mak2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 062f6fb38..702721f92 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ noconfig_targets := menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig clean distclean \
release tags TAGS
TOPDIR=./
-include Rules.mak
+-include Rules.mak
DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
diff --git a/Rules.mak b/Rules.mak
index 343c8e6ae..ed57b7be0 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -93,7 +93,7 @@ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1;
then echo "$(1)"; else echo "$(2)"; fi)
# Make certain these contain a final "/", but no "//"s.
-TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))
+TARGET_ARCH:=$(shell grep -s ^TARGET_ARCH .config | sed -e 's/^TARGET_ARCH=//' -e 's/"//g')
RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
export RUNTIME_PREFIX DEVEL_PREFIX