From f687798edf96c00c615a67709867a65e9f77a87d Mon Sep 17 00:00:00 2001
From: Lars-Magnus Skog <ralphtheninja@riseup.net>
Date: Thu, 25 Jan 2018 15:07:43 +0100
Subject: [PATCH 1/2] remove io.js + tweaks

---
 README.md    | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7e0fdae..67a0c70 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # prebuild
 
-> A command line tool for easily doing prebuilds for multiple versions of [Node.js](https://nodejs.org/en/), [io.js](https://iojs.org/en/) and [Electron](http://electron.atom.io/) on a specific platform.
+> A command line tool for easily making prebuilt binaries for multiple versions of [Node.js](https://nodejs.org/en/) and [Electron](http://electron.atom.io/) on a specific platform.
 
 ```
 $ npm install -g prebuild
@@ -11,7 +11,7 @@ $ npm install -g prebuild
 
 ## Features
 
-* Builds native modules for any version of Node.js, io.js or Electron, without having to switch between different versions to do so. This works by only downloading the correct headers and telling `node-gyp` to use those instead of the ones installed on your system.
+* Builds native modules for any version of Node.js or Electron, without having to switch between different versions to do so. This works by only downloading the correct headers and telling `node-gyp` to use those instead of the ones installed on your system.
 * Upload (`--upload`) prebuilt binaries to GitHub.
 * Support for stripping (`--strip`) debug information. Strip command defaults to `strip` but can be overridden by the `STRIP` environment variable.
 * Install prebuilt modules via [`prebuild-install`](https://github.com/mafintosh/prebuild-install).
diff --git a/package.json b/package.json
index 95a0576..cb2a1fd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "prebuild",
   "version": "7.2.2",
-  "description": "A command line tool for easily doing prebuilds for multiple versions of node/iojs or electron on a specific platform",
+  "description": "A command line tool for easily making prebuilt binaries for multiple versions of node or electron on a specific platform",
   "scripts": {
     "test": "tape test && npm run lint",
     "audit": "nsp check",

From 25353ce529d296f9280eed0f31e7abb3a9c07f8b Mon Sep 17 00:00:00 2001
From: Lars-Magnus Skog <ralphtheninja@riseup.net>
Date: Sat, 27 Jan 2018 19:18:28 +0100
Subject: [PATCH 2/2] only set CXX for linux

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7e21286..1b1913b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,8 @@ addons:
       - g++-4.9
       - gcc-4.9
 
-env:
-  global:
-    - CXX: g++-4.9
-    - CC: gcc-4.9
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-4.9; fi
 
 matrix:
   include: