X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Externals%2Fcross-compiler%2FMakefile;h=52397094ff266bb43309ddd1d4550fa4d3a09d6d;hb=ad12abcd42d1c8f0bd196c6c824a054545cf66d2;hp=60c94d282614380ef02608d0ce7810740061e4ab;hpb=bdefac5f54668fcccff11a69619ff31b25595eeb;p=tpg%2Facess2.git

diff --git a/Externals/cross-compiler/Makefile b/Externals/cross-compiler/Makefile
index 60c94d28..52397094 100644
--- a/Externals/cross-compiler/Makefile
+++ b/Externals/cross-compiler/Makefile
@@ -21,6 +21,7 @@ PARLEVEL ?= 1
 
 TARGET=$(BFDARCH)-pc-acess2
 PREFIX=$(shell pwd)/cross
+SYSROOT=$(shell pwd)/sysroot-$(ARCH)
 
 .PHONY: all clean binutils gcc include
 
@@ -28,9 +29,9 @@ all: include binutils gcc
 
 include:
 	mkdir -p $(PREFIX)
-	rm -r $(PREFIX)/include
-	ln -s $(ACESSDIR)/Usermode/include $(PREFIX)/include
-	cd $(PREFIX) && (test \! -e usr && ln -s . usr); true
+	mkdir -p $(SYSROOT)/usr
+	-ln -s $(ACESSDIR)/Usermode/include $(SYSROOT)/usr/include
+	-ln -s $(ACESSDIR)/Usermode/Output/$(ARCH)/Libs $(SYSROOT)/usr/lib
 
 gcc: $(GCC_DIR) $(PREFIX)/bin/$(TARGET)-gcc
 
@@ -45,7 +46,7 @@ $(warning $(BINUTILS_DIR) $(GCC_DIR))
 
 $(GCC_DIR)/%: patches/gcc/%.patch
 	@echo [PATCH] $@
-	@tar -xf $(GCC_ARCHIVE) $@
+	#@tar -xf $(GCC_ARCHIVE) $@
 	@patch $@ $<
 $(GCC_DIR)/%: patches/gcc/%
 	@echo [CP] $@
@@ -53,7 +54,7 @@ $(GCC_DIR)/%: patches/gcc/%
 
 $(BINUTILS_DIR)/%: patches/binutils/%.patch
 	@echo [PATCH] $@
-	@tar -xf $(BINUTILS_ARCHIVE) $@
+	#@tar -xf $(BINUTILS_ARCHIVE) $@
 	@patch $@ $<
 $(BINUTILS_DIR)/%: patches/binutils/%
 	@echo [CP] $@
@@ -64,16 +65,19 @@ BDIR_BINUTILS := build-$(ARCH)/binutils
 
 $(BDIR_BINUTILS)/Makefile: $(addprefix $(BINUTILS_DIR)/,$(BINUTILS_CHANGES))
 	@mkdir -p $(BDIR_BINUTILS)
-	@cd $(BDIR_BINUTILS) && ../../$(BINUTILS_DIR)/configure --target=$(TARGET) --prefix=$(PREFIX) --disable-nls
+	@cd $(BDIR_BINUTILS) && ../../$(BINUTILS_DIR)/configure --target=$(TARGET) --prefix=$(PREFIX) --disable-nls "--with-sysroot=$(SYSROOT)" --enable-shared
 
 $(PREFIX)/bin/$(TARGET)-ld: $(BDIR_BINUTILS)/Makefile
-	@cd $(BDIR_BINUTILS) && make all install -j $(PARLEVEL)
+	@make -C $(BDIR_BINUTILS) all -j $(PARLEVEL)
+	@make -C $(BDIR_BINUTILS) install
 
 $(BDIR_GCC)/Makefile: Makefile $(addprefix $(GCC_DIR)/,$(GCC_CHANGES))
 	@mkdir -p $(BDIR_GCC)
-	@cd $(BDIR_GCC) && PATH=$(PREFIX)/bin:$$PATH ../../$(GCC_DIR)/configure --target=$(TARGET) --prefix=$(PREFIX) --disable-nls --enable-langs=c,c++ --includedir=$(ACESSDIR)/Usermode/include --libdir=$(ACESSDIR)/Usermode/Output/$(ARCH)/Lib "--with-sysroot=$(PREFIX)"
+	@cd $(BDIR_GCC) && PATH=$(PREFIX)/bin:$$PATH ../../$(GCC_DIR)/configure --target=$(TARGET) --prefix=$(PREFIX) --disable-nls --enable-langs=c,c++ --includedir=$(ACESSDIR)/Usermode/include "--with-sysroot=$(SYSROOT)"
 
 $(PREFIX)/bin/$(TARGET)-gcc: $(BDIR_GCC)/Makefile
-	@cd $(BDIR_GCC) && PATH=$(PREFIX)/bin:$$PATH make all-gcc all-target-libgcc install-gcc install-target-libgcc -j $(PARLEVEL)
+	@PATH=$(PREFIX)/bin:$$PATH make -C $(BDIR_GCC) all-gcc -j $(PARLEVEL)
+	@PATH=$(PREFIX)/bin:$$PATH make -C $(BDIR_GCC) all-target-libgcc -j $(PARLEVEL)
+	@make -C $(BDIR_GCC) install-gcc install-target-libgcc