From 4b20443637a4a8adcad01276a86f2f6e93c3d32a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 11 Jan 2006 01:23:16 +0000 Subject: move the HAVE_SHARED/libc check down to after we source .config --- Rules.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index cd914a3a8..c46affa8b 100644 --- a/Rules.mak +++ b/Rules.mak @@ -1,7 +1,7 @@ # Rules.make for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen +# Copyright (C) 2000-2006 Erik Andersen # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -61,11 +61,7 @@ LIBC := libc SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION) UCLIBC_LDSO := ld-uClibc.so.$(MAJOR_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a -ifeq ($(HAVE_SHARED),y) libc := $(top_builddir)lib/$(SHARED_MAJORNAME) -else -libc := -endif interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) headers_dep := $(top_builddir)include/bits/sysnum.h @@ -84,6 +80,10 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -include $(top_builddir).config endif +ifneq ($(HAVE_SHARED),y) +libc := +endif + ifndef CROSS CROSS=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) endif -- cgit v1.2.3