rustbuild: Use current_dir instead of -C

[alexcrichton]

Apparently some versions of git don't support the -C flag, so let's use the
guaranteed-to-work current_dir function.

[rust-highfive]

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

[sophiajt]

@bors r+

[bors]

📌 Commit 6b2cf78 has been approved by jonathandturner

[bors]

⌛ Testing commit 6b2cf78 with merge 20abf70...

[bors]

💔 Test failed - auto-linux-64-cross-freebsd

[alexcrichton]

@bors: retry

On Tue, Sep 13, 2016 at 7:51 PM, bors notifications@github.com wrote:

💔 Test failed - auto-linux-64-cross-freebsd
https://buildbot.rust-lang.org/builders/auto-linux-64-cross-freebsd/builds/1629

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#36456 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95OuOj0eN6XNgCCGnvOEQoO_38Op5ks5qp2EYgaJpZM4J8Dh5
.

[bors]

⌛ Testing commit 6b2cf78 with merge 0f7fe2f...

[bors]

💔 Test failed - auto-linux-64-cross-freebsd

[sophiajt]

Pinging @alexcrichton - do we still need this? If so, do you know what fix this needs?

[alexcrichton]

@bors: r=jonathandturner

Let's see if that works

[bors]

📌 Commit d68f7eb has been approved by jonathandturner

[bors]

⌛ Testing commit d68f7eb with merge 704bcc0...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: jonathandturner
Pushing 704bcc0 to master...

[TimNN]

This (I think) broke using rustbuild from a different directory for me :(

I'm getting

logic@sys:~/build/rust-out/dev-build$ python ../../rust/src/bootstrap/bootstrap.py --step check-rpass --stage 1
    Finished debug [unoptimized + debuginfo] target(s) in 0.0 secs
Synchronizing submodule url for 'src/compiler-rt'
Synchronizing submodule url for 'src/jemalloc'
Synchronizing submodule url for 'src/liblibc'
Synchronizing submodule url for 'src/llvm'
Synchronizing submodule url for 'src/rt/hoedown'
Synchronizing submodule url for 'src/rust-installer'
fatal: Not a git repository (or any of the parent directories): .git


command did not execute successfully: "git" "reset" "--hard"
expected success, got: exit code: 128


logic@sys:~/build/rust-out/dev-build$

Edit: Reverting d68f7eb did indeed fix the problem

[alexcrichton]

@TimNN oh dear! could you describe the directory layout here? Also maybe run with -v to see what's getting run?

[TimNN]

Looking at the patch, this probably needs to join self.src before the submodule.path.

The layout is basically something like

+ home
|--- rust-src <-- checkout
|--- rust-build <-- build directory

Edit: -v did not help, it's just printing running: "git" "reset" "--hard"

[alexcrichton]

Ah right, sounds good to me! (adding self.src.join(..)). Want to send a PR?

[TimNN]

Yeah, I can send a PR. However that will have to wait until tomorrow (it's getting late here) so if anyone wants to send one before then, feel free.

[alexcrichton]

Awesome, thanks!