diff options
| author | bors <bors@rust-lang.org> | 2015-08-27 05:35:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-27 05:35:02 +0000 |
| commit | 0d5142f9b8c5897c4bda662fdcf47a4cb208677e (patch) | |
| tree | 0c8149faabbe6e54c7822c3034dd7b7c64dffc42 | |
| parent | ab21fe59e9dc79dd9949ab663e3d94e41273131c (diff) | |
| parent | 2d0cb31d3011224c33ec780b8b2ff7bd17b6ab7f (diff) | |
| download | rust-0d5142f9b8c5897c4bda662fdcf47a4cb208677e.tar.gz rust-0d5142f9b8c5897c4bda662fdcf47a4cb208677e.zip | |
Auto merge of #28023 - jmesmon:llvm-path-native-only, r=alexcrichton
This fixes the case where we try to re-build & re-install rust to the same prefix (without uninstalling) while using an llvm-root that is the same as the prefix. Without this, builds like that fail with: 'error: multiple dylib candidates for `std` found' See https://github.com/jmesmon/meta-rust/issues/6 for some details. May also be related to #20342.
| -rw-r--r-- | mk/main.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/main.mk b/mk/main.mk index b70926388ca..f2234e09203 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -294,7 +294,7 @@ LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version) LLVM_BINDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --bindir) LLVM_INCDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --includedir) LLVM_LIBDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --libdir) -LLVM_LIBDIR_RUSTFLAGS_$(1)=-L "$$(LLVM_LIBDIR_$(1))" +LLVM_LIBDIR_RUSTFLAGS_$(1)=-L native="$$(LLVM_LIBDIR_$(1))" LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags) ifeq ($$(findstring freebsd,$(1)),freebsd) # On FreeBSD, it may search wrong headers (that are for pre-installed LLVM), |