Use -m32 instead of a uname -m check.

diff --git a/Darwin.mk b/Darwin.mk
index db1dc260f1d749f6ea78e9cbbbf2533702d43bd6..0a995763033fb5d16cb2891ed020c6523a6b942e 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -9,7 +9,10 @@ library += -framework WebKit
 library += -liconv
 flags += -I/usr/include/ffi
 
 library += -liconv
 flags += -I/usr/include/ffi
 

-ifeq ($(uname_m),i386)
+ifeq ($(uname_p),i386)
+flags += -m32
+endif
+

 flags += -DCY_ATTACH
 code += Handler.o
 inject += Mach/Inject.o
 flags += -DCY_ATTACH
 code += Handler.o
 inject += Mach/Inject.o


@@ -17,7 +20,6 @@ Mach/Inject.o: Trampoline.t.hpp Baton.hpp
 
 %.t.hpp: %.t.cpp
        $(target)gcc -c -fno-exceptions -Iinclude -o $*.t.o $< && { file=($$($(target)otool -l $*.t.o | sed -e 'x; /^1/ { x; /^ *filesize / { s/^.* //; p; }; /^ *fileoff / { s/^.* //; p; }; x; }; x; /^ *cmd LC_SEGMENT$$/ { s/.*/1/; x; }; d;')); od -t x1 -j $${file[0]} -N $${file[1]} $*.t.o | sed -e 's/^[^ ]*//' | tr $$'\n' ' ' | sed -e 's/  */ /g;s/^ *//;s/ $$//;s/ /,/g;s/\([^,][^,]\)/0x\1/g' | sed -e 's/^/static const char $*_[] = {/;s/$$/};/' && echo && echo "/*" && $(target)otool -vVt $*.t.o && echo "*/"; } >$@ && rm -f $*.t.o
 
 %.t.hpp: %.t.cpp
        $(target)gcc -c -fno-exceptions -Iinclude -o $*.t.o $< && { file=($$($(target)otool -l $*.t.o | sed -e 'x; /^1/ { x; /^ *filesize / { s/^.* //; p; }; /^ *fileoff / { s/^.* //; p; }; x; }; x; /^ *cmd LC_SEGMENT$$/ { s/.*/1/; x; }; d;')); od -t x1 -j $${file[0]} -N $${file[1]} $*.t.o | sed -e 's/^[^ ]*//' | tr $$'\n' ' ' | sed -e 's/  */ /g;s/^ *//;s/ $$//;s/ /,/g;s/\([^,][^,]\)/0x\1/g' | sed -e 's/^/static const char $*_[] = {/;s/$$/};/' && echo && echo "/*" && $(target)otool -vVt $*.t.o && echo "*/"; } >$@ && rm -f $*.t.o

-endif

 
 include Execute.mk
 include ObjectiveC.mk
 
 include Execute.mk
 include ObjectiveC.mk

diff --git a/makefile b/makefile
index 42ba7d6e9945435b901f1c6f75198d42cdb24887..f582252a054b0cf2733d28732d4adc3052d688fe 100644 (file)
--- a/makefile
+++ b/makefile
@@ -46,7 +46,6 @@ depends :=
 restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)
 uname_p ?= $(shell uname -p)
 restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)
 uname_p ?= $(shell uname -p)

-uname_m ?= $(shell uname -m)

 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk