Skip to content

configure: have --enable-debug set -C debug-assertions=on so debug!() works again #23257

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.

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

Merged
merged 2 commits into from
Mar 12, 2015

Conversation

codyps
Copy link
Contributor

@codyps codyps commented Mar 10, 2015

configure: have --enable-debug set -C debug-assertions=on so debug!() works again

@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@emberian
Copy link
Member

@bors r+ fbc10c3 rollup

@Manishearth
Copy link
Member

This might be breaking tests

I get the following error in the rollup:

command: x86_64-unknown-linux-gnu/stage1/bin/rustc /opt/rust/src/test/run-pass/regions-nullary-variant.rs -L x86_64-unknown-linux-gnu/test/run-pass/ --target=x86_64-unknown-linux-gnu -L x86_64-unknown-linux-gnu/test/run-pass/regions-nullary-variant.stage1-x86_64-unknown-linux-gnulibaux -C prefer-dynamic -o x86_64-unknown-linux-gnu/test/run-pass/regions-nullary-variant.stage1-x86_64-unknown-linux-gnu --cfg rtopt --cfg debug =on -O -L x86_64-unknown-linux-gnu/rt
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
error: multiple input filenames provided

------------------------------------------

Note the -cfg debug =on, this seems to be happening for all of the rpass tests. Could you run make check-stage1-rpass and see if it's your PR causing the issue?

@pnkfelix
Copy link
Member

Yes, it is colliding with the logic in this line:
https://github.com/jmesmon/rust/blob/fix-debug/mk/tests.mk#L593

CTEST_RUSTC_FLAGS := $$(subst -C debug-assertions,,$$(CFG_RUSTC_FLAGS))

@pnkfelix
Copy link
Member

(an easy hack fix would be to put in two subst invocations there; the inner one would replace all -C debug-assertions=on with the empty string, and then the outer one would be the one we currently do.)

@codyps
Copy link
Contributor Author

codyps commented Mar 11, 2015

I've added a commit that does the quick hack @pnkfelix suggested.
Actually removing all the possible variants of debug-assertions probably requires the use of $(shell sed ...) in some form.

@alexcrichton
Copy link
Member

@bors: r+ 100e1a9

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 12, 2015
 configure: have --enable-debug set -C debug-assertions=on so `debug!()` works again
@bors bors merged commit 100e1a9 into rust-lang:master Mar 12, 2015
@codyps codyps deleted the fix-debug branch March 12, 2015 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants