Skip to content

Loading…

Support OS X #98

Merged
merged 2 commits into from

4 participants

@markandrus
  • Fixes 32/64-bit mismatch
  • Adds necessary libraries/frameworks
  • npm test now works
@markandrus markandrus Support OS X
* Fixes 32/64-bit mismatch
* Adds necessary libraries/frameworks
* `npm test` now works
7f14543
@pkieltyka

Btw, I can confirm this is worked on OS X 10.9.1.. I was struggling for npm test to pass until I found this PR. Thank you!

@corbanbrook

I can also confirm that this patch fixes npm install on OS X 10.8.5. all tests pass.

@modeswitch modeswitch commented on an outdated diff
bin/build.js
@@ -22,6 +22,10 @@
process.env.PATH = TOOLS_DEPOT_TOOLS_DIR + ':' + process.env.PATH;
process.env.GYP_GENERATORS = NINJA;
+ if (process.platform === 'darwin')
@modeswitch js-platform member

Put braces around this branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@modeswitch modeswitch merged commit 9a1a603 into js-platform:develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 2, 2014
  1. @markandrus

    Support OS X

    markandrus committed
    * Fixes 32/64-bit mismatch
    * Adds necessary libraries/frameworks
    * `npm test` now works
Commits on Mar 5, 2014
  1. @markandrus

    Add braces

    markandrus committed
Showing with 13 additions and 0 deletions.
  1. +5 −0 bin/build.js
  2. +8 −0 binding.gyp
View
5 bin/build.js
@@ -22,6 +22,11 @@
process.env.PATH = TOOLS_DEPOT_TOOLS_DIR + ':' + process.env.PATH;
process.env.GYP_GENERATORS = NINJA;
+ if (process.platform === 'darwin') {
+ process.env.GYP_DEFINES = process.env.GYP_DEFINES ||
+ ('host_arch=' + process.arch + ' target_arch=' + process.arch);
+ }
+
var argz = process.argv.slice(2);
argz.include = function(obj) {
return (this.indexOf(obj) !== -1);
View
8 binding.gyp
@@ -191,6 +191,14 @@
'../<(libwebrtc_out)/../libvpx_intrinsics_mmx.a',
'../<(libwebrtc_out)/../libvpx_intrinsics_sse2.a',
'../<(libwebrtc_out)/../libvpx_intrinsics_ssse3.a',
+ '../<(libwebrtc_out)/../libusrsctplib.a',
+ '../<(libwebrtc_out)/../libcommon_audio_sse2.a',
+ '../<(libwebrtc_out)/../libcrssl.a',
+ '../<(libwebrtc_out)/../libnss_static.a',
+ '../<(libwebrtc_out)/../libcrnspr.a',
+ '../<(libwebrtc_out)/../libcrnss.a',
+ '-framework AppKit',
+ '-framework QTKit',
'-lssl'
]
}],
Something went wrong with that request. Please try again.