Commit 2744551e authored by Marian-Vasile Laza's avatar Marian-Vasile Laza
Browse files

Backed out changeset 4e7cb3268e86 (bug 1798291) for causing python failures on...

Backed out changeset 4e7cb3268e86 (bug 1798291) for causing python failures on test_recursivemake.py. CLOSED TREE
parent c3c64535
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -1201,9 +1201,8 @@ class RecursiveMakeBackend(MakeBackend):
        self, obj, backend_file, target_variable, target_cargo_variable
    ):
        backend_file.write_once("CARGO_FILE := %s\n" % obj.cargo_file)
        target_dir = mozpath.normpath(backend_file.environment.topobjdir)
        backend_file.write("CARGO_TARGET_DIR := %s\n" % target_dir)
        backend_file.write("%s += $(DEPTH)/%s\n" % (target_variable, obj.location))
        backend_file.write_once("CARGO_TARGET_DIR := .\n")
        backend_file.write("%s += %s\n" % (target_variable, obj.location))
        backend_file.write("%s += %s\n" % (target_cargo_variable, obj.name))

    def _process_rust_program(self, obj, backend_file):
+1 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ class TestRecursiveMakeBackend(BackendTester):

        expected = [
            "CARGO_FILE := %s/code/Cargo.toml" % env.topsrcdir,
            "CARGO_TARGET_DIR := %s" % env.topobjdir,
            "CARGO_TARGET_DIR := .",
            "RUST_PROGRAMS += i686-pc-windows-msvc/release/target.exe",
            "RUST_CARGO_PROGRAMS += target",
            "HOST_RUST_PROGRAMS += i686-pc-windows-msvc/release/host.exe",