Fixing various FreeBSD issues.

diff --git a/Exception.hpp b/Exception.hpp
index a6aa5ef331c953d90779a7483170a2e01886fe43..286fdeb3fc7ba44a29983ef34b2746a55eb1e0dc 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -74,6 +74,8 @@ void CYThrow(JSContextRef context, JSValueRef value);
         return NULL; \
     }
 
         return NULL; \
     }
 

+// XXX: fix this: _ is not safe; this is /not/ Menes ;P
+#undef _assert

 #define _assert(test, args...) do { \
     if (!(test)) \
         CYThrow("*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \
 #define _assert(test, args...) do { \
     if (!(test)) \
         CYThrow("*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \

diff --git a/FreeBSD.mk b/FreeBSD.mk
index 3c39e4625978a0ced7c0acc2bf27a1eb210a25d8..ac4b846dbe433acf47781bdcfad448e60b88563c 100644 (file)
--- a/FreeBSD.mk
+++ b/FreeBSD.mk
@@ -1,2 +1,3 @@
 export PATH := /usr/local/bin:/usr/local/GNUstep/System/Tools:$(PATH)
 export PATH := /usr/local/bin:/usr/local/GNUstep/System/Tools:$(PATH)

+gcc := g++44

 include PkgConfig.mk
 include PkgConfig.mk

diff --git a/Parser.hpp b/Parser.hpp
index a963d7ba662d4d7127aabb221e5feeed462e5991..f48e81bff435c3400645a8665117ad6714fb116b 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -50,6 +50,7 @@
 #include <map>
 #include <set>
 
 #include <map>
 #include <set>
 

+#include <cstdio>

 #include <cstdlib>
 
 #include "location.hh"
 #include <cstdlib>
 
 #include "location.hh"

diff --git a/makefile b/makefile
index efcb4eb658cfce99be34fcc1481c3a14f5992d02..89e54756795d813a5ee88ac1d161b72b63c10051 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,6 +6,7 @@ else
 target := $(PKG_TARG)-
 endif
 
 target := $(PKG_TARG)-
 endif
 

+gcc := g++

 flags ?= -g3 -O0 -DYYDEBUG=1
 
 paths := $(foreach path,$(paths),$(wildcard $(path)))
 flags ?= -g3 -O0 -DYYDEBUG=1
 
 paths := $(foreach path,$(paths),$(wildcard $(path)))


@@ -118,24 +119,24 @@ lex.cy.c: Cycript.l
 #      ./Parser.py <Parser.dat >$@
 
 Cycript.tab.o: Cycript.tab.cc $(header)
 #      ./Parser.py <Parser.dat >$@
 
 Cycript.tab.o: Cycript.tab.cc $(header)

-       $(target)g++ $(flags) -c -o $@ $<
+       $(target)$(gcc) $(flags) -c -o $@ $<

 
 lex.cy.o: lex.cy.c $(header)
 
 lex.cy.o: lex.cy.c $(header)

-       $(target)g++ $(flags) -c -o $@ $<
+       $(target)$(gcc) $(flags) -c -o $@ $<

 
 %.o: %.cpp $(header)
 
 %.o: %.cpp $(header)

-       $(target)g++ $(flags) -c -o $@ $<
+       $(target)$(gcc) $(flags) -c -o $@ $<

 
 #objc := -x c++
 %.o: %.mm $(header)
 
 #objc := -x c++
 %.o: %.mm $(header)

-       $(target)g++ $(objc) $(flags) -c -o $@ $<
+       $(target)$(gcc) $(objc) $(flags) -c -o $@ $<

 
 libcycript.$(dll): $(code)
 
 libcycript.$(dll): $(code)

-       $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
+       $(target)$(gcc) $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)

        $(ldid) $@
 
 cycript: Console.o libcycript.$(dll) $(inject)
        $(ldid) $@
 
 cycript: Console.o libcycript.$(dll) $(inject)

-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
+       $(target)$(gcc) $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)

        $(entitle) cycript
 
 package: $(deb)
        $(entitle) cycript
 
 package: $(deb)