fixed noeabi toolchain's issues (worked)

[attic/toolchain-noeabi.git] / Makefile

diff --git a/Makefile b/Makefile
index d209adc8663a569a52f96f1494ba07fcb4a4ee82..da19b957e915b40d28058c9bad6dec29aa20fc3a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -171,8 +171,8 @@ $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2:
 
 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2:
        wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-ports-$(GLIBC_VERSION).tar.bz2
-$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
 
+$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
        tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
        cd $(WORK)/glibc-$(GLIBC_VERSION) && \
                tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
@@ -196,7 +196,7 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
                RANLIB="$(TARGET)-ranlib" \
                $(WORK)/glibc-$(GLIBC_VERSION)/configure --prefix=/usr \
                --libexecdir=/usr/lib/glibc --host=$(TARGET) --build=$(HOST) \
-               --disable-profile --enable-addons --with-tls --enable-kernel=2.6.0 \
+               --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
                --with-__thread --with-binutils=$(CROSSTOOLS)/bin \
                --with-headers=$(CLFS)/usr/include --cache-file=config.cache && \
                make && make install || exit 1
@@ -223,6 +223,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
                AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
                $(WORK)/gcc-$(GCC_VERSION)/configure --prefix=$(CROSSTOOLS) \
                --build=$(HOST) --host=$(HOST) --target=$(TARGET) \
+               --with-headers=$(CLFS)/usr/include \
                --disable-multilib --with-sysroot=$(CLFS) --disable-nls \
                --enable-languages=c,c++ --enable-__cxa_atexit \
                --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \
@@ -241,28 +242,18 @@ gcc-final-distclean: gcc-final-clean
 
 
 # TEST THE TOOLCHAIN
-$(WORK)/build-test:
-       mkdir -p $(WORK)/build-test
-       touch $(WORK)/build-test
-
-$(WORK)/build-test/hello.c: $(WORK)/build-test
-       echo '#include <stdio.h>' > $(WORK)/build-test/hello.c
-       echo 'int main(int argc,char ** argv){printf("Hello World!\n");return 0;}' >> $(WORK)/build-test/hello.c
-       touch $(WORK)/build-test/hello.c
-
-$(WORK)/build-test/hello: $(WORK)/build-test/hello.c
-       cd $(WORK)/build-test && \
-               export PATH=$$PATH:$(CROSSTOOLS)/bin && \
-               unset CFLAGS && unset CXXFLAGS && unset CC && \
-               AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
-               $(TARGET)-gcc -Wall -o hello hello.c
-       [ "$$(file -b $(WORK)/build-test/hello | cut -d',' -f2 | sed 's| ||g' )" == "ARM"  ] || exit 1
-       touch $(WORK)/build-test/hello
+$(WORK)/test: $(WORK)/test.c
+       export PATH=$$PATH:$(CROSSTOOLS)/bin && \
+       unset CFLAGS && unset CXXFLAGS && unset CC && \
+       AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
+       $(TARGET)-gcc -Wall -o $(WORK)/test $(WORK)/test.c
+       [ "`file -b $(WORK)/test | cut -d',' -f2 | sed 's| ||g'`" = "ARM"  ] || exit 1
+       touch $(WORK)/test
 
-test: gcc-final $(WORK)/build-test/hello
+test: gcc-final $(WORK)/test
 
 test-clean:
-       rm -vrf $(WORK)/build-test
+       rm -vrf $(WORK)/test
 
 test-distclean: test-clean