Fix gyp options that were lost in #651. Fixes #663
Merge #664 r=@natevw: Fix gyp options that were lost in #651

Fixes #663