Merge pull request #51 from rust-osdev/fix-rustflags

Set empty RUSTFLAGS to ensure that no .cargo/config applies
rust-osdev · Apr 1, 2020 · d3b3905 · d3b3905
2 parents 3462674 + 2ba0f81
commit d3b3905
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,7 +16,7 @@ jobs:
         image_name: 'ubuntu-16.04'
         rustup_toolchain: stable
       mac:
-        image_name: 'macos-10.13'
+        image_name: 'macOS-10.15'
         rustup_toolchain: stable
       windows:
         image_name: 'vs2017-win2016'
@@ -75,7 +75,7 @@ jobs:
         image_name: 'ubuntu-16.04'
         rustup_toolchain: nightly
       mac:
-        image_name: 'macos-10.13'
+        image_name: 'macos-10.15'
         rustup_toolchain: nightly
       windows:
         image_name: 'vs2017-win2016'

diff --git a/src/builder.rs b/src/builder.rs
@@ -233,7 +233,7 @@ impl Builder {
             cmd.arg("--release");
             cmd.env("KERNEL", kernel_bin_path);
             cmd.env("KERNEL_MANIFEST", &self.kernel_manifest_path);
-            cmd.env_remove("RUSTFLAGS");
+            cmd.env("RUSTFLAGS", "");
             cmd.env("XBUILD_SYSROOT_PATH", target_dir.join("bootloader-sysroot")); // for cargo-xbuild
             cmd
         };
@@ -477,10 +477,11 @@ impl fmt::Display for CreateBootimageError {
                 "Could not find required key `{}` in cargo metadata output",
                 key
             ),
-            CreateBootimageError::BootloaderNotFound => {
-                writeln!(f, "Bootloader dependency not found\n\n\
-                    You need to add a dependency on a crate named `bootloader` in your Cargo.toml.")
-            }
+            CreateBootimageError::BootloaderNotFound => writeln!(
+                f,
+                "Bootloader dependency not found\n\n\
+                    You need to add a dependency on a crate named `bootloader` in your Cargo.toml."
+            ),
             CreateBootimageError::BootloaderInvalid(err) => writeln!(
                 f,
                 "The `bootloader` dependency has not the right format: {}",