Auto merge of #123 - Eijebong:makeflags, r=nox

Set MAKEFLAGS to CARGO_MAKEFLAGS for the make command

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/123)
<!-- Reviewable:end -->

Author: bors-servo

build.rs

@@ -34,12 +34,22 @@ fn main() {
         make = OsStr::new("mozmake").to_os_string();
     }
 
-    let result = Command::new(make)
-        .args(&["-R", "-f", "makefile.cargo"])
+    let mut cmd = Command::new(make);
+
+    // We're using the MSYS make which doesn't work with the mingw32-make-style
+    // MAKEFLAGS, so remove that from the env if present.
+    if cfg!(windows) {
+        cmd.env_remove("MAKEFLAGS").env_remove("MFLAGS");
+    } else if let Some(makeflags) = env::var_os("CARGO_MAKEFLAGS") {
+        cmd.env("MAKEFLAGS", makeflags);
+    }
+
+    let result = cmd.args(&["-R", "-f", "makefile.cargo"])
         .stdout(Stdio::inherit())
         .stderr(Stdio::inherit())
         .status()
         .expect("Failed to run `make`");
+
     assert!(result.success());
     println!("cargo:rustc-link-search=native={}/js/src", out_dir);
     println!("cargo:rustc-link-lib=static=js_static"); // Must come before c++

makefile.cargo

@@ -126,7 +126,7 @@ SRC_DIR = $(shell pwd)
 .PHONY : all maybe-configure
 
 all: maybe-configure
-	cd $(OUT_DIR) && $(MAKE) -f Makefile -j$(NUM_JOBS)
+	cd $(OUT_DIR) && $(MAKE) -f Makefile
 
 # Only touch and run configure if we need to, to avoid unnecessary rebuilds.
 # The second two time checks handle the case of configure.in and configure having