Browse Source

fix build on Darwin, need to find a way to get mkimage on Darwin later

Waldemar Brodkorb 9 years ago
parent
commit
5cf51a3d46
2 changed files with 4 additions and 3 deletions
  1. 3 3
      mk/build.mk
  2. 1 0
      target/config/Config.in.tools

+ 3 - 3
mk/build.mk

@@ -554,13 +554,13 @@ buildall:
 	$(GMAKE) VERBOSE=1 all 2>&1 | tee firmware/buildall.log
 
 $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c
-	@$(HOST_CC) -O0 -g0 -static-libgcc -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
+	@$(HOST_CC) -O0 -g0 -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
 
 $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c
-	@$(HOST_CC) -O0 -g0 -static-libgcc -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
+	@$(HOST_CC) -O0 -g0 -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
 
 $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
-	@$(HOST_CC) -O0 -g0 -static-libgcc -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
+	@$(HOST_CC) -O0 -g0 -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
 
 menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard target/*/collections)
 	@echo "Generating menu structure ..."

+ 1 - 0
target/config/Config.in.tools

@@ -33,6 +33,7 @@ config ADK_HOST_BUILD_LIBTOOL
 
 config ADK_HOST_BUILD_U_BOOT
 	boolean
+	default n if ADK_HOST_DARWIN
 	default y
 
 # always required, but can be provided by host