Use target from rust itself

Author: alex

.travis.yml

@@ -4,7 +4,7 @@ matrix:
 
 language: rust
 rust:
-    - nightly-2019-08-15
+    - nightly-2019-09-05
 cache:
     - cargo: true
 

README.md

@@ -76,7 +76,7 @@ cd hello-world
 3. Build the static object with cargo xbuild, pointing it at our custom target
 
 ```
-cargo xbuild --target $(pwd)/../x86_64-linux-kernel-module.json
+cargo xbuild --target x86_64-linux-kernel
 ```
 
 4. Build the kernel module using the Linux kernel build system (kbuild)

build.rs

@@ -109,7 +109,7 @@ fn main() {
         .derive_default(true)
         .rustfmt_bindings(true);
 
-    builder = builder.clang_arg("--target=x86_64-linux-kernel-module");
+    builder = builder.clang_arg("--target=x86_64-linux-kernel");
     for arg in shlex::split(std::str::from_utf8(&output.stdout).unwrap()).unwrap() {
         builder = builder.clang_arg(arg.to_string());
     }
@@ -141,7 +141,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-module");
+    builder.target("x86_64-linux-kernel");
     builder.warnings(false);
     builder.file("src/helpers.c");
     for arg in shlex::split(std::str::from_utf8(&output.stdout).unwrap()).unwrap() {

hello-world/Makefile

@@ -2,7 +2,7 @@ obj-m := helloworld.o
 helloworld-objs := hello_world.rust.o
 KDIR ?= /lib/modules/$(shell uname -r)/build
 
-%.rust.o: target/x86_64-linux-kernel-module/debug/lib%.a
+%.rust.o: target/x86_64-linux-kernel/debug/lib%.a
 	$(LD) -r -o $@ --whole-archive $<
 
 all:

tests/Makefile

@@ -2,7 +2,7 @@ obj-m := testmodule.o
 testmodule-objs := $(TEST_NAME).rust.o
 KDIR ?= /lib/modules/$(shell uname -r)/build
 
-%.rust.o: target/x86_64-linux-kernel-module/debug/lib%.a
+%.rust.o: target/x86_64-linux-kernel/debug/lib%.a
 	$(LD) -r -o $@ --whole-archive $<
 
 all:

tests/run_tests.py

@@ -27,10 +27,7 @@ def main():
         print("+ [{}]".format(path))
         run(
             "cargo", "xbuild",
-            "--target",
-            os.path.join(
-                BASE_DIR, os.path.pardir, "x86_64-linux-kernel-module.json"
-            ),
+            "--target", "x86_64-linux-kernel",
             cwd=os.path.join(BASE_DIR, path),
             environ=dict(
                 os.environ,