X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=65b56b7df5c0ea703708eebe943ead1e4a5c7357;hb=06387752a84130f22cdc4babd4a8936d3a30a2f4;hp=031983c2d1fc06a08d0585d424d04d354ed289fb;hpb=9a5deead77ca4a9c25ba063cd88d4a7852465899;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 031983c..65b56b7 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ debug                  :=
 gcc_flags              := $(gcc_optimizations) $(debug) -ffunction-sections -fdata-sections -Isrc/org/ijg
 gcj_flags              := -fCLASSPATH=bin 
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
 gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 strip                  := $(gcc_path)/$(target)/bin/strip
@@ -138,7 +139,7 @@ gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 link: $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
 	echo "linking        .o -> $(target_bin)"
 	$(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
-	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
+	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ -lstdc++ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
 
 .headers: $(java_classes)
 	cd bin; for A in `find * -name \*.class`; do \
@@ -167,7 +168,7 @@ $(java_objects): bin-$(platform)/%.java.o: src/%.java $(java_classes)
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc src/org/ijg/jmorecfg.h
 	@echo "compiling     .cc -> .o:     $<"
 	@mkdir -p `dirname $@`
-	$(gcc) -Ibin -c $< -o $@
+	$(g++) -Ibin -c $< -o $@
 
 $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
 	@echo "compiling      .c -> .o:     $<"
@@ -222,6 +223,7 @@ PalmOS:
 
 current_build         := $(shell cat next.build)
 this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
+this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
 
 dist:
 	# this will fail if we haven't checked-in since the comment is null; we want this.
@@ -238,7 +240,7 @@ dist:
 		tail -n 200 .make-dist.out | \
 			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch) \
+		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch_flag) \
 			| grep -v "make...:.\(Entering\|Leaving\).directory"
         endif