From 26b44b2b0272e7f51415942c72328e9a3dbe400a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 26 Mar 2010 20:46:37 +0100 Subject: toolchain: prepare for more than two alternatives Lay down the path to add more than two toolchain kinds: - check the type of toolchain as: ifeq (toolchain_buildroot,y) blabla buildroot-specific else ifeq (toolchain_external,y) blabla external-specific endif - prefer using positive checks, a-la: ifeq (foo,y) instead of: ifneq (bar,y) (where foo and bar are mutually exclusive) - have the toolchain_buildroot case always appear first - gettext is handled differently, because we want to add an option only if not using the buildroot toolchain, hence we use ifneq. Signed-off-by: Yann E. MORIN Acked-By: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fed6e124b..b746934f9 100644 --- a/Makefile +++ b/Makefile @@ -199,7 +199,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared ############################################################## ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers -else +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) BASE_TARGETS:=uclibc endif TARGETS:= @@ -301,7 +301,7 @@ include toolchain/kernel-headers/kernel-headers.mk include toolchain/mklibs/mklibs.mk include toolchain/sstrip/sstrip.mk include toolchain/uClibc/uclibc.mk -else +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) include toolchain/*/*.mk endif @@ -363,7 +363,7 @@ $(STAGING_DIR): ifeq ($(BR2_TOOLCHAIN_SYSROOT),y) @mkdir -p $(STAGING_DIR)/usr/lib else -ifneq ($(BR2_TOOLCHAIN_EXTERNAL),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) @ln -snf . $(STAGING_DIR)/usr @mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME) @ln -snf ../lib $(STAGING_DIR)/usr/lib -- cgit v1.2.3