From 8622b1fe4bca17955dae00c825b4db11ec89c36f Mon Sep 17 00:00:00 2001 From: Bebbo Date: Sun, 10 Jun 2018 16:55:28 +0200 Subject: [PATCH 1/2] fix order of libamiga/libnix --- Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index cf0bf43..5f96e61 100644 --- a/Makefile +++ b/Makefile @@ -549,6 +549,19 @@ build/_netinclude: projects/amiga-netinclude/README.md build/ndk-include/_ndk $( projects/amiga-netinclude/README.md: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/bebbo/amiga-netinclude + +# ================================================= +# libamiga +# ================================================= +LIBAMIGA=$(PREFIX)/m68k-amigaos/lib/libamiga.a $(PREFIX)/m68k-amigaos/lib/libb/libamiga.a + +libamiga: $(LIBAMIGA) + @echo "built $(LIBAMIGA)" + +$(LIBAMIGA): + mkdir -p $(@D) + cp -p $(patsubst $(PREFIX)/m68k-amigaos/%,%,$@) $(@D) + # ================================================= # libnix # ================================================= @@ -570,7 +583,7 @@ build/libnix/_done: build/libnix/Makefile @echo "done" >$@ @echo "built $(LIBNIX)" -build/libnix/Makefile: build/newlib/_done build/ndk-include/_ndk build/ndk-include/_ndk13 build/_netinclude build/binutils/_done build/gcc/_done projects/libnix/configure projects/libnix/Makefile.in $(LIBNIX_SRC) $(LIBAMIGA) +build/libnix/Makefile: build/newlib/_done build/ndk-include/_ndk build/ndk-include/_ndk13 build/_netinclude build/binutils/_done build/gcc/_done projects/libnix/configure projects/libnix/Makefile.in $(LIBAMIGA) $(LIBNIX_SRC) mkdir -p $(PREFIX)/m68k-amigaos/libnix/lib/libnix mkdir -p build/libnix echo 'void foo(){}' > build/libnix/x.c @@ -586,18 +599,6 @@ projects/libnix/configure: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/bebbo/libnix -# ================================================= -# libamiga -# ================================================= -LIBAMIGA=$(PREFIX)/m68k-amigaos/lib/libamiga.a $(PREFIX)/m68k-amigaos/lib/libb/libamiga.a - -libamiga: $(LIBAMIGA) - @echo "built $(LIBAMIGA)" - -$(LIBAMIGA): - mkdir -p $(@D) - cp -p $(patsubst $(PREFIX)/m68k-amigaos/%,%,$@) $(@D) - # ================================================= # gcc libs # ================================================= From baa1cd7936ce1d3507e00985b2a259ee8e3efae2 Mon Sep 17 00:00:00 2001 From: Bebbo Date: Sat, 16 Jun 2018 20:55:52 +0200 Subject: [PATCH 2/2] disable share gcc libs --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f96e61..2904c19 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ status-all: # gcc # ================================================= CONFIG_GCC=--prefix=$(PREFIX) --target=m68k-amigaos --enable-languages=c,c++,objc --enable-version-specific-runtime-libs --disable-libssp --disable-nls \ - --with-headers=$(PWD)/projects/newlib-cygwin/newlib/libc/sys/amigaos/include/ + --with-headers=$(PWD)/projects/newlib-cygwin/newlib/libc/sys/amigaos/include/ --disable-shared GCC_CMD = m68k-amigaos-c++ m68k-amigaos-g++ m68k-amigaos-gcc-$(GCC_VERSION) m68k-amigaos-gcc-nm \