Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mk: Fix building with --enable-ccache #33314

Merged
merged 1 commit into from
May 7, 2016
Merged

mk: Fix building with --enable-ccache #33314

merged 1 commit into from
May 7, 2016

Conversation

alexcrichton
Copy link
Member

We will no longer use ccache in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes #33285

@rust-highfive
Copy link
Collaborator

r? @brson

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

@pnkfelix
Copy link
Member

pnkfelix commented May 3, 2016

@bors r+

(works for me locally)

@bors
Copy link
Contributor

bors commented May 3, 2016

📌 Commit d12f3fc has been approved by pnkfelix

@pnkfelix
Copy link
Member

pnkfelix commented May 3, 2016

@bors rollup

@Manishearth Manishearth mentioned this pull request May 3, 2016
Merged
@Manishearth
Copy link
Member

I think http://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-mir/builds/578/steps/compile/logs/stdio is this PR?

mkdir -p x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/
cp: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/compiler-rt.lib
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/libcore
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/liblibc
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/librand
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/liballoc_system
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/liballoc
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/librustc_unicode
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/libcollections
touch x86_64-pc-windows-msvc/rt/backtrace.lib
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/libstd
rustc: x86_64-pc-windows-msvc/stage0/lib/rustlib/x86_64-pc-windows-msvc/lib/libarena
compile: x86_64-pc-windows-msvc/rt/miniz.o
/c/bot/slave/auto-win-msvc-64-opt-mir/build/mk/rt.mk:90: recipe for target 'x86_64-pc-windows-msvc/rt/miniz.o' failed
>> rustjob: found 1 remaining processes
>> rustjob: found remaining: 3520 - "\\Device\\HarddiskVolume1\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\mspdbsrv.exe"
>> rustjob:     oops, this is mspdbsrv
make: C:\Program: Command not found
make: *** [x86_64-pc-windows-msvc/rt/miniz.o] Error 127
program finished with exit code 2
elapsedTime=74.519000

@pnkfelix
Copy link
Member

pnkfelix commented May 3, 2016

@Manishearth argh, yeah, probably.

Maybe we can conditionally include the single-quotes based on whether ccache is turned on or not?

@pnkfelix
Copy link
Member

pnkfelix commented May 3, 2016

(Or we could change the whole way that --enable-ccache works, injecting an additional variable that expands to null normally but when enabled expands to the path to ccache ...)

@alexcrichton
Copy link
Member Author

I'm going to tweak FIND_COMPILER for now but yeah we should probably just change how we enable ccache.

@bors: r=pnkfelix f2d929e

bors added a commit that referenced this pull request May 3, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
1fb4b5b 
Rollup of 14 pull requests

- Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372
- Failed merges:
bors added a commit that referenced this pull request May 3, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
f7125fc 
Rollup of 14 pull requests

- Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372
- Failed merges:
bors added a commit that referenced this pull request May 4, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
1895d08 
Rollup of 14 pull requests

- Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372
- Failed merges:
@durka
Copy link
Contributor

durka commented May 4, 2016

This doesn't work for me locally on Linux. It now looks for " gcc" and can't find that either.

@durka
Copy link
Contributor

durka commented May 4, 2016

However, the earlier d12f3fc does seem to work for me.

@alexcrichton
Copy link
Member Author

@bors: r=pnkfelix d71e63c

makefiles really are just the worst

bors added a commit that referenced this pull request May 4, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
7a0ccc4 
Rollup of 14 pull requests

- Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372
- Failed merges:
@bors
Copy link
Contributor

bors commented May 5, 2016

☔ The latest upstream changes (presumably #33381) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
mk: Fix building with --enable-ccache
39eec80 
We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@alexcrichton
Copy link
Member Author

@bors: r=pnkfelix 39eec80

steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 5, 2016
@steveklabnik
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
e44162f 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@steveklabnik steveklabnik mentioned this pull request May 5, 2016
Closed
@steveklabnik steveklabnik mentioned this pull request May 5, 2016
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 5, 2016
@steveklabnik
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
bad6402 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 5, 2016
@steveklabnik
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
3f68400 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@steveklabnik steveklabnik mentioned this pull request May 5, 2016
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 6, 2016
@steveklabnik
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
8fbc5c4 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@steveklabnik steveklabnik mentioned this pull request May 6, 2016
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 7, 2016
@GuillaumeGomez
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
3811d66 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 7, 2016
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 7, 2016
@steveklabnik
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
6a3f601 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@steveklabnik steveklabnik mentioned this pull request May 7, 2016
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 7, 2016
@steveklabnik
Rollup merge of rust-lang#33314 - alexcrichton:fix-enable-ccache, r=p…
4e41e8b 
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
@steveklabnik steveklabnik mentioned this pull request May 7, 2016
Merged
bors added a commit that referenced this pull request May 7, 2016
@bors
Auto merge of #33487 - steveklabnik:rollup, r=steveklabnik
d91f8ab 
Rollup of 20 pull requests

- Successful merges: #33256, #33283, #33313, #33314, #33326, #33336, #33382, #33384, #33402, #33409, #33410, #33412, #33428, #33430, #33437, #33438, #33439, #33442, #33456, #33459
- Failed merges:
@bors bors merged commit 39eec80 into rust-lang:master May 7, 2016
@alexcrichton alexcrichton deleted the fix-enable-ccache branch May 12, 2016 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brson brson

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@alexcrichton @rust-highfive @pnkfelix @bors @Manishearth @durka @brson