diff --git a/Rakefile b/Rakefile index ac58a62..c4c1820 100644 --- a/Rakefile +++ b/Rakefile @@ -28,7 +28,7 @@ task :manual_compile do require File.expand_path '../ext/libv8/arch.rb', __FILE__ include Libv8::Arch Dir.chdir(V8_Source) do - sh "make #{libv8_arch}.release" + sh "make -j2 #{libv8_arch}.release" end end diff --git a/spec/libv8_spec.rb b/spec/libv8_spec.rb index 3aecf54..8397456 100644 --- a/spec/libv8_spec.rb +++ b/spec/libv8_spec.rb @@ -7,7 +7,6 @@ describe Libv8 do it "can find the static library components" do Pathname(libv8_base).should exist Pathname(libv8_snapshot).should exist - Pathname(libv8_nosnapshot).should exist end it "has a valid include path" do @@ -15,7 +14,7 @@ describe Libv8 do end it "can retrieve objects by name" do - libv8_objects(:base, :snapshot, :nosnapshot).each do |obj| + libv8_objects(:base, :snapshot).each do |obj| Pathname(obj).should exist end end diff --git a/v8-gyp-osx-x64-support.patch b/v8-gyp-osx-x64-support.patch deleted file mode 100644 index c13801f..0000000 --- a/v8-gyp-osx-x64-support.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/Makefile b/Makefile -index 5dc6ca5..e4e36d8 100644 ---- a/Makefile -+++ b/Makefile -@@ -260,4 +260,4 @@ $(ENVFILE).new: - # Dependencies. - dependencies: - svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \ -- --revision 1026 -+ --revision 1251 -diff --git a/build/common.gypi b/build/common.gypi -index 5c0c323..4f2452c 100644 ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -317,6 +317,16 @@ - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', - '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], - }], -+ ['OS=="mac" and target_arch=="ia32"', { -+ 'xcode_settings': { -+ 'ARCHS': ['i386'] -+ } -+ }], -+ ['OS=="mac" and target_arch=="x64"', { -+ 'xcode_settings': { -+ 'ARCHS': ['x86_64'] -+ } -+ }], - ], - }, # Debug - 'Release': { -@@ -358,6 +368,18 @@ - # is specified explicitly. - 'GCC_STRICT_ALIASING': 'YES', - }, -+ 'conditions': [ -+ ['target_arch=="ia32"', { -+ 'xcode_settings': { -+ 'ARCHS': ['i386'] -+ } -+ }], -+ ['target_arch=="x64"', { -+ 'xcode_settings': { -+ 'ARCHS': ['x86_64'] -+ } -+ }], -+ ], - }], # OS=="mac" - ['OS=="win"', { - 'msvs_configuration_attributes': { -diff --git a/build/gyp_v8 b/build/gyp_v8 -index 4293e76..54f3f7f 100755 ---- a/build/gyp_v8 -+++ b/build/gyp_v8 -@@ -156,7 +156,12 @@ if __name__ == '__main__': - - # Generate for the architectures supported on the given platform. - gyp_args = list(args) -- gyp_args.append('-Dtarget_arch=ia32') -+ target_arch = None -+ for p in gyp_args: -+ if p.find('-Dtarget_arch=') == 0: -+ target_arch = p -+ if target_arch is None: -+ gyp_args.append('-Dtarget_arch=ia32') - if utils.GuessOS() == 'linux': - gyp_args.append('-S-ia32') - run_gyp(gyp_args) -diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp -index 764789a..2913cdf 100644 ---- a/tools/gyp/v8.gyp -+++ b/tools/gyp/v8.gyp -@@ -59,6 +59,9 @@ - '../../src/v8dll-main.cc', - ], - 'conditions': [ -+ ['OS=="mac"', { -+ 'xcode_settings': {'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']}, -+ }], - ['OS=="win"', { - 'defines': [ - 'BUILDING_V8_SHARED', -@@ -536,7 +539,7 @@ - '../../src/arm/stub-cache-arm.cc', - ], - }], -- ['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', { -+ ['v8_target_arch=="ia32"', { - 'sources': [ - '../../src/ia32/assembler-ia32-inl.h', - '../../src/ia32/assembler-ia32.cc', -@@ -601,7 +604,7 @@ - '../../src/mips/stub-cache-mips.cc', - ], - }], -- ['v8_target_arch=="x64" or v8_target_arch=="mac" or OS=="mac"', { -+ ['v8_target_arch=="x64"', { - 'sources': [ - '../../src/x64/assembler-x64-inl.h', - '../../src/x64/assembler-x64.cc', -@@ -982,6 +985,9 @@ - }, { - 'toolsets': ['target'], - }], -+ ['OS=="mac" and component=="shared_library"', { -+ 'xcode_settings': {'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']}, -+ }], - ], - 'link_settings': { - 'libraries': [ \ No newline at end of file