Fixed a few bugs in the cross-compile and a GNUstep related casting issue.

diff --git a/Console.cpp b/Console.cpp
index 49952e461b694ee04f076eaf7388ef63e84334fd..77e9759a7e558e7c50e1164070921e57fecae6bc 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -542,6 +542,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             }
         } catch (...) {
             _syscall(close(server));
             }
         } catch (...) {
             _syscall(close(server));

+            throw;

         }
     }
 #else
         }
     }
 #else

diff --git a/Darwin.mk b/Darwin.mk
index a1773fd3a84325ac527cf1ce67b1b7c74d4b82da..9c480e24936e9c3683a56bc917b909c11da54aa4 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -15,6 +15,6 @@ inject += Mach/Inject.o
 Mach/Inject.o: Trampoline.t.hpp Baton.hpp
 
 %.t.hpp: %.t.cpp
 Mach/Inject.o: Trampoline.t.hpp Baton.hpp
 
 %.t.hpp: %.t.cpp

-       $(target)gcc -c -o $*.t.o $< && { $(target)otool -l $*.t.o | sed -e '/^ *segname __TEXT$$/ { x; s/^ *sectname //; p; }; /^ *sectname / x; d;' | while read -r sect; do otool -s __TEXT "$$sect" Trampoline.t.o; done | sed -e '/:$$/ d; / section$$/ d; s/^[^ \t]*[ \t]*//;s/ $$//;s/ /\n/g' | sed -e 's/\(..\)\(..\)\(..\)\(..\)/0\x\4,0\x\3,0\x\2,0\x\1/' | tr '\n' ',' | sed -e '$$ s/,$$//; s/^/static const char $*_[] = {/;s/$$/};\n/' && echo && echo "/*" && $(target)otool -vVt $*.t.o && echo "*/"; } >$@ && rm -f $*.t.o
+       $(target)gcc -c -o $*.t.o $< && { $(target)otool -l $*.t.o | sed -e '/^ *segname __TEXT$$/ { x; s/^ *sectname //; p; }; /^ *sectname / x; d;' | while read -r sect; do $(target)otool -s __TEXT "$$sect" Trampoline.t.o; done | sed -e '/:$$/ d; / section$$/ d; s/^[^ \t]*[ \t]*//;s/ $$//;s/ /\n/g' | sed -e 's/\(..\)\(..\)\(..\)\(..\)/0\x\4,0\x\3,0\x\2,0\x\1/' | tr '\n' ',' | sed -e '$$ s/,$$//; s/^/static const char $*_[] = {/;s/$$/};\n/' && echo && echo "/*" && $(target)otool -vVt $*.t.o && echo "*/"; } >$@ && rm -f $*.t.o

 
 include ObjectiveC.mk
 
 include ObjectiveC.mk

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 128d1f23c48cb275f23cc067d280e25181e85544..83e4776872dd1524f4b39942bcffe53e36b40893 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -2135,7 +2135,8 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR
     const char *name(sel_getName(internal->GetValue()));
 
     CYPoolTry {
     const char *name(sel_getName(internal->GetValue()));
 
     CYPoolTry {

-        return CYCastJSValue(context, CYJSString(context, [NSString stringWithFormat:@"@selector(%s)", name]));
+        NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
+        return CYCastJSValue(context, CYJSString(context, string));

     } CYPoolCatch(NULL)
 } CYCatch }
 
     } CYPoolCatch(NULL)
 } CYCatch }