openbsd: pass stdc++ library path after LVVM library path #29794
+13
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
under openbsd, the library path of libstdc++ need to be explicit (due to the fact the default linker `cc` is gcc-4.2, and not gcc-4.9). but when a recent LLVM is installed, rustc compilation pikes the bad LLVM version (which live in /usr/local/lib, which is same directory of libestdc++.so for gcc-4.9). this patch move the libstdc++ path from RUST_FLAGS_<target> to special variable, and use it *after* LLVM_LIBDIR_RUSTFLAGS_<target> in arguments.
| @@ -128,7 +129,9 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \ | |||
| $$(TSREQ$(1)_T_$(2)_H_$(3)) \ | |||
| | $$(TBIN$(1)_T_$(2)_H_$(3))/ | |||
| @$$(call E, rustc: $$@) | |||
| $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4) | |||
| $$(STAGE$(1)_T_$(2)_H_$(3)) \ | |||
| $$(STDCPP_LIBDIR_RUSTFLAGS_$(2)) \ | |||
There was a problem hiding this comment.
Was this necessary to compile correctly? No other extra flags are passed in here so I'm a little wary this should be needed for correctness.
There was a problem hiding this comment.
yes. In this target, we do the final linking of a tool binary. So the path for libstdc++ has to be know.
Before, the value came from RUST_FLAGS_<target>. Now we need to explicitly add it.
The error without it is:
note: /usr/bin/ld: cannot find -lestdc++
collect2: ld returned 1 exit status
There was a problem hiding this comment.
hm right, I guess maybe this'll all be nice to look at one day...
bors
added a commit
that referenced
this pull request
Nov 17, 2015
under openbsd, the library path of libstdc++ need to be explicit (due to the fact the default linker `cc` is gcc-4.2, and not gcc-4.9). but when a recent LLVM is installed, rustc compilation pikes the bad LLVM version (which live in /usr/local/lib, which is same directory of libestdc++.so for gcc-4.9). this patch move the libstdc++ path from RUST_FLAGS_<target> to special variable, and use it *after* LLVM_LIBDIR_RUSTFLAGS_<target> in arguments. r? @alexcrichton
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
under openbsd, the library path of libstdc++ need to be explicit (due
to the fact the default linker
ccis gcc-4.2, and not gcc-4.9).but when a recent LLVM is installed, rustc compilation pikes the bad
LLVM version (which live in /usr/local/lib, which is same directory of
libestdc++.so for gcc-4.9).
this patch move the libstdc++ path from RUST_FLAGS_ to special
variable, and use it after LLVM_LIBDIR_RUSTFLAGS_ in
arguments.
r? @alexcrichton