The ucfront wrapper was missing. Some apps need this to configure.
Signed-off-by: Thomas Chou <[EMAIL PROTECTED]>
---
vendors/Altera/nios2nommu/config.arch | 61 +++++++-------------------------
1 files changed, 14 insertions(+), 47 deletions(-)
diff --git a/vendors/Altera/nios2nommu/config.arch
b/vendors/Altera/nios2nommu/config.arch
index bbae947..cf15add 100644
--- a/vendors/Altera/nios2nommu/config.arch
+++ b/vendors/Altera/nios2nommu/config.arch
@@ -27,11 +27,11 @@ CONFIG_UCLINUX=y
CONFIG_UCLINUX=y
-CC = $(CROSS_COMPILE)gcc
-AS = $(CROSS_COMPILE)as
-CXX = $(CROSS_COMPILE)g++
+CC = $(ucfront_cc) $(CROSS_COMPILE)gcc $(CPUFLAGS)
+AS = $(CROSS_COMPILE)as $(CPUFLAGS)
+CXX = $(ucfront_cxx) $(CROSS_COMPILE)g++ $(CPUFLAGS)
AR = $(CROSS_COMPILE)ar
-LD = $(CROSS_COMPILE)ld
+LD = $(ucfront_ld) $(CROSS_COMPILE)ld $(CPULDFLAGS)
OBJCOPY = $(CROSS_COMPILE)objcopy
RANLIB = $(CROSS_COMPILE)ranlib
ELF2FLT = $(CROSS_COMPILE)elf2flt
@@ -40,6 +40,9 @@ STRIP = $(STRIPTOOL)
UCLINUX_BUILD_SET = 0 # have we set a special
config below
+# Pull in common definitions
+include $(ROOTDIR)/vendors/config/common/config.arch
+
# These can be used by configure.
# Either configure $(CONFIGURE_OPTS)
# or configure --host=$(TARGETARCH) --build=$(HOSTARCH)
--target=$(TARGETARCH)
@@ -84,47 +87,6 @@ ifdef UCLINUX_BUILD_USER
GCC_DIR = $(shell $(CC) -v 2>&1 | grep specs | sed -e 's/.*
\(.*\)specs/\1\./')
GCC_LIB = ~/buildroot/build_nios2/staging_dir/lib
- SLIBC = -lc
- SLIBM = -lm
- SLIBNET = -lnet
- SLIBDES = -ldes
- SLIBAES = -laes
- SLIBPCAP = -lpcap
- SLIBSSL = -lssl
- SLIBCRYPTO = -lcrypto
-
- LIBC = $(SLIBC)
- LIBM = $(SLIBM)
- LIBNET = $(SLIBNET)
- LIBDES = $(SLIBDES)
- LIBAES = $(SLIBAES)
- LIBPCAP = $(SLIBPCAP)
- LIBSSL = $(SLIBSSL)
- LIBCRYPTO = $(SLIBCRYPTO)
- LIBCRYPT = -lcrypt
- LIBGCC = -lgcc
- LIBIBERTY = -liberty
- LIBIO = -lio
- LIBIOSTREAM = -liostream
- LIBSTDCPP = -lstdc++
-
- LDPATH = \
- -L$(ROOTDIR)/lib \
- -L$(ROOTDIR)/lib/libnet \
- -L$(ROOTDIR)/lib/libdes \
- -L$(ROOTDIR)/lib/libaes \
- -L$(ROOTDIR)/lib/libpcap \
- -L$(ROOTDIR)/lib/libssl
-
- INCLIBC =
- INCLIBM =
- INCNET = -I$(ROOTDIR)/lib/libnet
- INCDES = -I$(ROOTDIR)/freeswan/libdes
- INCAES = -I$(ROOTDIR)/freeswan/libcrypto/libaes
- INCGMP = -I$(ROOTDIR)/lib/libgmp
- INCPCAP = -I$(ROOTDIR)/lib/libpcap
- INCSSL = -I$(ROOTDIR)/lib/libssl/include
- INCVEND = -I$(ROOTDIR)/vendors/include
ifdef CONFIG_USER_DEBUG
CFLAGS := -O1 -g
@@ -133,7 +95,6 @@ ifdef UCLINUX_BUILD_USER
endif
CFLAGS += $(VENDOR_CFLAGS)
CFLAGS += -Dlinux -D__linux__ -Dunix -D__uClinux__ -DEMBED
- CFLAGS += $(INCLIBC) $(INCLIBM)
CFLAGS += -I$(ROOTDIR)
CFLAGS += -I$(ROOTDIR)/include
CFLAGS += -fno-builtin
@@ -142,7 +103,6 @@ ifdef UCLINUX_BUILD_USER
CXXFLAGS = $(CFLAGS) $(INCCXX) -fname-mangling-version-0
LDFLAGS = $(CFLAGS) -Wl,-d -Wl,-elf2flt
- LDLIBS = $(LDPATH) -lcrypt -lutil $(LIBC)
CXXLIBS = $(LDPATH) $(LIBSTDCPP) $(LIBIOSTREAM) $(LIBIO) $(LIBIBERTY) \
$(LIBC) $(LIBGCC)
@@ -161,6 +121,13 @@ endif
#
ifeq ($(UCLINUX_BUILD_SET),1)
+ EXTRA_CFLAGS := $(CPUFLAGS)
+
+ CXXLIBS = $(LIBSTDCPP) $(CXXSUP)
+
+ ucfront_cc := ucfront-gcc
+ ucfront_cxx := ucfront-g++
+ ucfront_ld := ucfront-ld
endif
############################################################################
--
1.5.3.3
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
