diff options
| author | Wayne Meissner <wayne@ManBearPig.local> | 2009-10-03 19:47:27 +1000 |
|---|---|---|
| committer | Wayne Meissner <wayne@ManBearPig.local> | 2009-10-03 19:47:27 +1000 |
| commit | 3e1b4bab589d51a5790b0b1eea7721b71848ef62 (patch) | |
| tree | ba586d20ac950cc846e176bc9cd656c0d1e38039 | |
| parent | e582d1cfc8bfc6610eb0aee58fe0267704f027ab (diff) | |
| download | ffi-3e1b4bab589d51a5790b0b1eea7721b71848ef62.tar.gz | |
Snow leopard build fixes
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | libtest/GNUmakefile | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -146,7 +146,7 @@ task :install => 'gem:install' desc "Clean all built files" task :distclean => :clobber do FileUtils.rm_rf('build') - FileUtils.rm_rf(Dir['lib/**/ffi_c.so']) + FileUtils.rm_rf(Dir["lib/**/ffi_c.#{Config::CONFIG['DLEXT']}"]) FileUtils.rm_rf('lib/1.8') FileUtils.rm_rf('lib/1.9') FileUtils.rm_rf('conftest.dSYM') @@ -156,7 +156,7 @@ end desc "Build the native test lib" task "build/libtest.#{LIBEXT}" do - sh %{#{GMAKE} -f libtest/GNUmakefile CPU=#{CPU} OS=#{OS} CC="#{CC}" } + sh %{#{GMAKE} -f libtest/GNUmakefile CPU=#{CPU} OS=#{OS} } end diff --git a/libtest/GNUmakefile b/libtest/GNUmakefile index f8bb047..9d06df2 100644 --- a/libtest/GNUmakefile +++ b/libtest/GNUmakefile @@ -53,11 +53,12 @@ ifneq ($(strip $(findstring $(OS), win32, mingw, cygwin)),) endif PICFLAGS= LIBEXT=dll + CC ?= gcc endif ifeq ($(OS), darwin) ARCHFLAGS = -arch ppc - ifeq ($(CPU),i386) + ifneq ($(findstring $(CPU),i386 x86_64),) ARCHFLAGS += -arch i386 -arch x86_64 endif CFLAGS += $(ARCHFLAGS) -DTARGET_RT_MAC_CFM=0 |