Build - Fix build quirks for fresh

diff --git a/Externals/cross-compiler/Makefile b/Externals/cross-compiler/Makefile
index ae2df5a..935d646 100644 (file)
--- a/Externals/cross-compiler/Makefile
+++ b/Externals/cross-compiler/Makefile
@@ -35,7 +35,7 @@ $(BDIR_GCC)/Makefile: Makefile $(addprefix $(GCC_DIR)/,$(GCC_CHANGES)) $(GCC_DIR
 
 $(PREFIX)/bin/$(TARGET)-gcc: $(BDIR_GCC)/Makefile
        @$(ENVVARS) make -C $(BDIR_GCC) $(GCC_TARGETS:%=all-%) -j $(PARLEVEL)
 
 $(PREFIX)/bin/$(TARGET)-gcc: $(BDIR_GCC)/Makefile
        @$(ENVVARS) make -C $(BDIR_GCC) $(GCC_TARGETS:%=all-%) -j $(PARLEVEL)

-       @$(ENVVARS) make -C $(BDIR_GCC)libstdc++-v3/ all-target-libsupc++ -j $(PARLEVEL)
+       #@$(ENVVARS) make -C $(BDIR_GCC)/libstdc++-v3/ all-target-libsupc++ -j $(PARLEVEL)

        @$(ENVVARS) make -C $(BDIR_GCC) $(GCC_TARGETS:%=install-%)
 
 
        @$(ENVVARS) make -C $(BDIR_GCC) $(GCC_TARGETS:%=install-%)
 
 

diff --git a/Makefile b/Makefile
index a2e46d1..cb21b45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 
 SUBMAKE = $(MAKE) --no-print-directory
 
 
 SUBMAKE = $(MAKE) --no-print-directory
 

-USRLIBS := crt0.o ld-acess.so libc.so libposix.so libc++.so
+USRLIBS := crt0.o ld-acess.so libc.so libposix.so libc++.so libpthread.so

 USRLIBS += libreadline.so libnet.so liburi.so libpsocket.so
 USRLIBS += libimage_sif.so libunicode.so libm.so
 USRLIBS += libaxwin4.so
 USRLIBS += libreadline.so libnet.so liburi.so libpsocket.so
 USRLIBS += libimage_sif.so libunicode.so libm.so
 USRLIBS += libaxwin4.so


@@ -136,5 +136,6 @@ $(CC):
        @echo ---
        @echo $(CC) does not exist, recompiling
        @echo ---
        @echo ---
        @echo $(CC) does not exist, recompiling
        @echo ---

+       for dir in $(USRLIBS:%=Usermode/Libraries/%_src); do $(SUBMAKE) -C $$dir _libs; done

        make -C Externals/cross-compiler/ -f Makefile.cross
 endif
        make -C Externals/cross-compiler/ -f Makefile.cross
 endif

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 3b8d2f5..de263f5 100644 (file)
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -55,6 +55,7 @@ HEADERS := $(patsubst include_exp/%,../../include/%,$(shell find include_exp/ -n
 _libs: $(HEADERS)
 
 ../../include/%: include_exp/%
 _libs: $(HEADERS)
 
 ../../include/%: include_exp/%

+       @echo [LN] $@

        @mkdir -p $(dir $@)
        @ln -s $(shell pwd)/$< $@
 
        @mkdir -p $(dir $@)
        @ln -s $(shell pwd)/$< $@