Merge pull request #72 from pbhogan/develop

Resolve issue with macOS Mojave

Author: johanns

Rakefile

@@ -16,25 +16,33 @@ require 'rdoc/task'
 
 task :default => [:clean, :compile_ffi, :spec]
 
-desc "clean, make and run specs"
-task :spec  do
+desc 'clean, make and run specs'
+task :spec do
   RSpec::Core::RakeTask.new
 end
 
-desc "FFI compiler"
-namespace "ffi-compiler" do
+desc 'FFI compiler'
+namespace 'ffi-compiler' do
   FFI::Compiler::CompileTask.new('ext/scrypt/scrypt_ext') do |t|
-    t.cflags << "-Wall -std=c99"
-    t.cflags << "-msse -msse2" if t.platform.arch.include? "86"
-    t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
-    t.cflags << "-D_POSIX_C_SOURCE=199309L" if RbConfig::CONFIG['host_os'].downcase =~ /linux/
-    t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
-    t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?
+    target_cpu = RbConfig::CONFIG['target_cpu']
+
+    t.cflags << '-Wall -std=c99'
+    t.cflags << '-msse -msse2' if t.platform.arch.include? '86'
+    t.cflags << '-D_GNU_SOURCE=1' if RbConfig::CONFIG['host_os'].downcase =~ /mingw/
+    t.cflags << '-D_POSIX_C_SOURCE=199309L' if RbConfig::CONFIG['host_os'].downcase =~ /linux/
+
+    if 1.size == 4 && target_cpu =~ /i386|x86_32/ && t.platform.mac?
+      t.cflags << '-arch i386'
+      t.ldflags << '-arch i386'
+    elsif 1.size == 8 && target_cpu =~ /i686|x86_64/ && t.platform.mac?
+      t.cflags << '-arch x86_64'
+      t.ldflags << '-arch x86_64'
+    end
 
     t.add_define 'WINDOWS_OS' if FFI::Platform.windows?
   end
 end
-task :compile_ffi => ["ffi-compiler:default"]
+task :compile_ffi => ['ffi-compiler:default']
 
 CLEAN.include('ext/scrypt/*{.o,.log,.so,.bundle}')
 CLEAN.include('lib/**/*{.o,.log,.so,.bundle}')
@@ -47,10 +55,9 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('COPYING', 'lib/**/*.rb')
 end
 
-
-desc "Run all specs"
-RSpec::Core::RakeTask.new do |t|
-  rspec_opts = ['--colour','--backtrace']
+desc 'Run all specs'
+RSpec::Core::RakeTask.new do |_t|
+  rspec_opts = ['--colour', '--backtrace']
 end
 
 def gem_spec

ext/scrypt/Rakefile

@@ -1,12 +1,21 @@
 require 'ffi-compiler/compile_task'
 
+target_cpu = RbConfig::CONFIG['target_cpu']
+
 FFI::Compiler::CompileTask.new('scrypt_ext') do |t|
-  t.cflags << "-Wall -std=c99"
-  t.cflags << "-msse -msse2" if t.platform.arch.include? "86"
-  t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
-  t.cflags << "-D_POSIX_C_SOURCE=199309L" if RbConfig::CONFIG['host_os'].downcase =~ /linux/
-  t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
-  t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?
+  t.cflags << '-Wall -std=c99'
+  t.cflags << '-msse -msse2' if t.platform.arch.include? '86'
+  t.cflags << '-D_GNU_SOURCE=1' if RbConfig::CONFIG['host_os'].downcase =~ /mingw/
+  t.cflags << '-D_POSIX_C_SOURCE=199309L' if RbConfig::CONFIG['host_os'].downcase =~ /linux/
+
+  if 1.size == 4 && target_cpu =~ /i386|x86_32/ && t.platform.mac?
+    t.cflags << '-arch i386'
+    t.ldflags << '-arch i386'
+  elsif 1.size == 8 && target_cpu =~ /i686|x86_64/ && t.platform.mac?
+    t.cflags << '-arch x86_64'
+    t.ldflags << '-arch x86_64'
+  end
+
   t.export '../../lib/scrypt/scrypt_ext.rb'
 
   t.add_define 'WINDOWS_OS' if FFI::Platform.windows?