Implement --cc and --cxx flags for overriding compiler detection (#191)

* Implement --cc and --cxx flags for overriding compiler detection * Update README.md with --cc and --cxx
cmake-js · Sep 25, 2019 · b0f9a09 · b0f9a09
1 parent cd1ab85
commit b0f9a09
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -135,6 +135,8 @@ Options:
   -T, --target           only build the specified target                [string]
   -C, --prefer-clang     use Clang compiler instead of default CMake compiler,
                          if available (Posix)                          [boolean]
+  --cc                   use the specified C compiler                   [string]
+  --cxx                  use the specified C++ compiler                 [string]
   -r, --runtime          the runtime to use                             [string]
   -v, --runtime-version  the runtime version to use                     [string]
   -a, --arch             the architecture to build in                   [string]
@@ -143,7 +145,6 @@ Options:
   -i, --silent           Prevents CMake.js to print to the stdio       [boolean]
   -O, --out              Specify the output directory to compile to, default is
                          projectRoot/build                              [string]
-                         projectRoot/build                              [string]
 ```
 
 **Requirements:**

diff --git a/bin/cmake-js b/bin/cmake-js
@@ -114,6 +114,16 @@ var yargs = require("yargs")
             describe: "use Clang compiler instead of default CMake compiler, if available (Posix)",
             type: "boolean"
         },
+        cc: {
+            demand: false,
+            describe: "use the specified C compiler",
+            type: "string"
+        },
+        cxx: {
+            demand: false,
+            describe: "use the specified C++ compiler",
+            type: "string"
+        },
         r: {
             alias: "runtime",
             demand: false,
@@ -188,6 +198,8 @@ var options = {
     preferXcode: argv.x,
     preferGnu: argv.g,
     preferClang: argv.C,
+    cCompilerPath: argv.cc,
+    cppCompilerPath: argv.cxx,
     runtime: argv.r,
     runtimeVersion: argv.v,
     arch: argv.a,

diff --git a/lib/es5/toolset.js b/lib/es5/toolset.js