* fixed GCC 4.4.0 mingw compilation:

[fw/sdcc] / support / scripts / build.mak

diff --git a/support/scripts/build.mak b/support/scripts/build.mak
index 3a01ae7e7a4c4a774776eb256ef6401059fbe2e8..d4f0477015f680a854d459abfc40b6bbaee80db7 100644 (file)
--- a/support/scripts/build.mak
+++ b/support/scripts/build.mak
@@ -10,6 +10,8 @@ BUILD = $(TOPDIR)/build/sdcc
 SDCCLIB = $(BUILD)
 CVSFLAGS = -z5
 CVS = cvs
+SVNFLAGS =
+SVN = svn
 DIR = .
 VER = 2.2.1
 # Used as a branch name.
@@ -24,7 +26,7 @@ COMPILE_MODE = linux-mingw32
 SDCC_OR_GBDK = sdcc
 
 ROOT_GBDK = :pserver:anonymous@cvs.gbdk.sourceforge.net:/cvsroot/gbdk
-ROOT_SDCC = :pserver:anonymous@cvs.sdcc.sourceforge.net:/cvsroot/sdcc
+ROOT_SDCC = https://sdcc.svn.sourceforge.net/svnroot/sdcc
 
 ifeq ($(COMPILE_MODE),linux-linux)
 # For Linux
@@ -62,25 +64,19 @@ clean:
        rm -rf $(BUILD) gbdk-lib gbdk-support sdcc logged_in
 
 update: logged_in
-       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_SDCC) co -r sdcc-$(SHORTVER) sdcc
+       cd $(DIR); svn $(SVNFLAGS) co $(ROOT_SDCC)/branches/sdcc-$(SHORTVER)/sdcc sdcc
        cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-lib
        cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-support
 
 _sdcc: sdcc-bin sdcc-misc sdcc-lib sdcc-doc
 
 tidy:
-       rm -rf `find $(BUILD) -name "CVS"`
-       rm -rf `find $(BUILD)/lib -name "*.asm"`
+       find $(BUILD) -name "CVS" -exec rm -rf \;
+       find $(BUILD) -name ".svn" -exec rm -rf \;
+       find $(BUILD)/lib -name "*.asm" -exec rm -rf \;
        -$(TNP)strip $(BUILD)/bin/*
 
 sdcc-bin: sdcc/sdccconf.h
-<<<<<<< build.mak
-       make -C sdcc sdcc-bin
-       mkdir -p $(BUILD)/bin
-       for i in \
-       sdcc sdcpp link-z80 as-z80 aslink asx8051 sdcdb; \
-       do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
-=======
        make -C sdcc sdcc-bin CROSS_LIBGC=$(CROSS_LIBGC)
        mkdir -p $(BUILD)/bin
        for i in \
@@ -93,7 +89,6 @@ sdcc-misc: sdcc/sdccconf.h
        for i in \
        sdcdb; \
        do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
->>>>>>> 1.1.2.5
        cp sdcc/sim/ucsim/s51.src/s51$(E) $(BUILD)/bin
        cp sdcc/sim/ucsim/z80.src/sz80$(E) $(BUILD)/bin
        cp sdcc/sim/ucsim/avr.src/savr$(E) $(BUILD)/bin
@@ -121,27 +116,20 @@ sdcc-lib-z80:
 sdcc-lib-gen:
        make -C sdcc sdcc-device
 
-<<<<<<< build.mak
-lcc:
-       make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/
-       cp gbdk-support/lcc/lcc$(E) $(BUILD)/bin
-
-=======
 lcc:
        make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/ TNP=$(TNP)
        cp gbdk-support/lcc/lcc$(SE) $(BUILD)/bin/lcc$(E)
 
->>>>>>> 1.1.2.5
 sdcc/sdccconf.h: sdcc/configure
 ifdef TNP
        cd sdcc; \
        export CCC=$(TNP)c++; \
        export RANLIB=$(TNP)ranlib; \
        export CC=$(TNP)gcc; \
-       ./configure --datadir=$(SDCC_ROOT)
+       ./configure --datarootdir=$(SDCC_ROOT)
        echo $$CCC
 else
-       cd sdcc; ./configure --datadir=$(SDCC_ROOT)
+       cd sdcc; ./configure --datarootdir=$(SDCC_ROOT)
 endif
 
 dist: _sdcc lcc tidy
@@ -153,7 +141,4 @@ logged_in:
        cvs -d$(ROOT_GBDK) login
        cvs -d$(ROOT_SDCC) login
        touch logged_in
-<<<<<<< build.mak
-       make update=======
        make -f build.mak update
->>>>>>> 1.1.2.5