summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-01-11 01:23:16 +0000
committerMike Frysinger <vapier@gentoo.org>2006-01-11 01:23:16 +0000
commit4b20443637a4a8adcad01276a86f2f6e93c3d32a (patch)
tree437a5d6df8d61278537fee5631611f82e8fe9db4
parent21dd9da95957cf66999015a7b74b3ccab745e1c1 (diff)
move the HAVE_SHARED/libc check down to after we source .config
-rw-r--r--Rules.mak10
1 files changed, 5 insertions, 5 deletions
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 <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
#
# 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