Reduce the hard-coding of the target

Author: alex

.travis.yml

@@ -17,7 +17,7 @@ install:
     - rustup component add rust-src rustfmt clippy
 
 script:
-    - ./tests/run_tests.py
+    - ./tests/run_tests.py x86_64-linux-kernel
     - |
       for p in . hello-world tests/*; do
         if [ -d "$p" ]; then

build.rs

@@ -122,13 +122,15 @@ fn main() {
         std::process::exit(1);
     }
 
+    let target = env::var("TARGET").unwrap();
+
     let mut builder = bindgen::Builder::default()
         .use_core()
         .ctypes_prefix("c_types")
         .derive_default(true)
         .rustfmt_bindings(true);
 
-    builder = builder.clang_arg("--target=x86_64-linux-kernel");
+    builder = builder.clang_arg(format!("--target={}", target));
     for arg in shlex::split(std::str::from_utf8(&output.stdout).unwrap()).unwrap() {
         builder = builder.clang_arg(arg.to_string());
     }
@@ -161,7 +163,7 @@ fn main() {
     let mut builder = cc::Build::new();
     println!("cargo:rerun-if-env-changed=CLANG");
     builder.compiler(env::var("CLANG").unwrap_or("clang".to_string()));
-    builder.target("x86_64-linux-kernel");
+    builder.target(&target);
     builder.warnings(false);
     builder.file("src/helpers.c");
     for arg in shlex::split(std::str::from_utf8(&output.stdout).unwrap()).unwrap() {

tests/run_tests.py

@@ -2,6 +2,7 @@
 
 import os
 import subprocess
+import sys
 
 
 BASE_DIR = os.path.realpath(os.path.dirname(__file__))
@@ -16,7 +17,8 @@ def run(*args, **kwargs):
     subprocess.check_call(list(args), cwd=cwd, env=environ)
 
 
-def main():
+def main(argv):
+    [_, target] = argv
     for path in os.listdir(BASE_DIR):
         if (
             not os.path.isdir(os.path.join(BASE_DIR, path)) or
@@ -27,7 +29,7 @@ def main():
         print("+ [{}]".format(path))
         run(
             "cargo", "build", "-Zbuild-std=core,alloc",
-            "--target", "x86_64-linux-kernel",
+            "--target", target,
             cwd=os.path.join(BASE_DIR, path),
             environ=dict(
                 os.environ,
@@ -60,4 +62,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main(sys.argv)