Commit a0aef7c4 authored by Eric Andersen's avatar Eric Andersen
Browse files

This should at least build. I think.

parent 15418c9c

Makefile

+10 −2
Original line number Diff line number Diff line
@@ -86,8 +86,11 @@ INSTALL_LIBSTDCPP=true 
TARGETS:=

# The toolchain comes next if we are building one

ifeq ($(USE_UCLIBC_TOOLCHAIN),true)

ifeq ($(GCC_2_95_TOOLCHAIN),true)

TARGETS+=binutils uclibc-configured gcc2_95

else

TARGETS+=binutils uclibc-configured gcc3_3

#TARGETS+=binutils uclibc-configured gcc2_95

endif

else

TARGETS+=uclibc

endif
@@ -113,7 +116,12 @@ TARGETS+=busybox tinylogin 


# Everything needed to build a full uClibc development system!

#TARGETS+=coreutils findutils bash make diffutils patch sed

#TARGETS+=ed flex bison file gawk tar grep gcc_target

#TARGETS+=ed flex bison file gawk tar grep



#If you want a development system, you probably want gcc built

# with uClibc so it can run within your dev system...

#TARGETS+=gcc2_95_target

TARGETS+=gcc3_3_target



# Of course, if you are installing a development system, you

# may want some header files so you can compile stuff....

make/gcc-3.3.mk

+3 −2
Original line number Diff line number Diff line
@@ -298,8 +298,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks 
	(cd $(GCC_BUILD_DIR3); ln -fs $(ARCH)-linux build-$(GNU_TARGET_NAME))

	(cd $(GCC_BUILD_DIR3); \

		$(TARGET_CONFIGURE_OPTS) \

		CC_FOR_BUILD=$(TARGET_CROSS)gcc \

		CXX_FOR_BUILD=$(TARGET_CROSS)g++ \

		CC_FOR_BUILD=$(HOSTCC) \

		CXX_FOR_BUILD=$(HOSTCC) \

		AR_FOR_TARGET=$(TARGET_CROSS)ar \

		AS_FOR_TARGET=$(TARGET_CROSS)as \

		LD_FOR_TARGET=$(TARGET_CROSS)ld \
@@ -326,6 +326,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks 
		--disable-shared $(MULTILIB) \

		--enable-target-optspace $(DISABLE_NLS) \

		--with-gnu-ld --disable-__cxa_atexit \

		--enable-clocale=gnu \

		--enable-languages=$(TARGET_LANGUAGES) \

		$(EXTRA_GCC_CONFIG_OPTIONS) \

		--program-prefix="" \

make/uclibc.mk

+9 −1
Original line number Diff line number Diff line
@@ -111,7 +111,15 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a 
		ln -fs /lib/libnsl.so.0 libnsl.so; \

	)



uclibc_target: gcc_final uclibc $(TARGET_DIR)/usr/lib/libc.a

ifeq ($(USE_UCLIBC_TOOLCHAIN),true)

ifeq ($(GCC_2_95_TOOLCHAIN),true)

uclibc_target: gcc2_95 uclibc $(TARGET_DIR)/usr/lib/libc.a

else

uclibc_target: gcc3_3 uclibc $(TARGET_DIR)/usr/lib/libc.a

endif

else

uclibc_target: uclibc $(TARGET_DIR)/usr/lib/libc.a

endif



uclibc_target-clean:

	rm -f $(TARGET_DIR)/include