Skip to content

Avoid passing -L "" to rustc.#23324

Merged
bors merged 1 commit into
rust-lang:masterfrom
rprichard:fix-freebsd
Mar 13, 2015
Merged

Avoid passing -L "" to rustc.#23324
bors merged 1 commit into
rust-lang:masterfrom
rprichard:fix-freebsd

Conversation

@rprichard

Copy link
Copy Markdown
Contributor

Currently, target.mk passes -L "" when LLVM_STDCPP_LOCATION_$(2) is empty.

This fixes #23287.

Currently, target.mk passes -L "" when LLVM_STDCPP_LOCATION_$(2) is empty.

This fixes rust-lang#23287.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pcwalton

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

@rprichard

Copy link
Copy Markdown
Contributor Author

I've verified that Rust compiles on FreeBSD 9 with this change. It also compiles on x86_64 Linux, with or without --enable-llvm-static-stdcpp. I'm building on 32-bit Windows, with and without --enable-llvm-static-stdcpp, and it has successfully built rustc_llvm-4e7c5e5c.dll linking with libstdc++ statically and dynamically.

@brson

brson commented Mar 13, 2015

Copy link
Copy Markdown
Contributor

@bors: r+ rollup

Thanks!

@bors

bors commented Mar 13, 2015

Copy link
Copy Markdown
Collaborator

@bors r=brson de52403

@rprichard

Copy link
Copy Markdown
Contributor Author

I added a compiler error for empty search paths, and it uncovered another instance of -L "" -- $$(LLVM_LIBDIR_$(2)) can also be empty. I think it comes up during cross-compilation. I'm fixing it in the makefiles. I could add a commit to this PR, but it looks like my commit is already in a rollup, so maybe I should create a new PR.

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 13, 2015
 Currently, target.mk passes -L \"\" when LLVM_STDCPP_LOCATION_$(2) is empty.

This fixes rust-lang#23287.
@bors bors merged commit de52403 into rust-lang:master Mar 13, 2015
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.

Cannot compile rustc on FreeBSD

5 participants