stdenv: expose libc/c++ stdlib header at runtime #95733
Closed
Conversation
This file contains 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
Mic92
commented
Aug 18, 2020
| fi | ||
|
|
||
| if [[ -f "$NIX_CC/nix-support/cxxpath" ]]; then | ||
| export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(< "$NIX_CC/nix-support/cxxpath") |
There was a problem hiding this comment.
If I am not mistaking this should also fix #73345 (comment)
Mic92
commented
Aug 18, 2020
Comment on lines
+311
to
+318
| + optionalString (libcxx != null | ||
| || (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false) | ||
| || (isGNU && cc.langCC or false)) '' | ||
| touch "$out/nix-support/libcxx-cxxflags" | ||
| touch "$out/nix-support/libcxx-ldflags" | ||
| '' | ||
| + optionalString (libcxx == null && (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false)) '' | ||
| + optionalString (libcxx == null | ||
| && (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false)) '' |
There was a problem hiding this comment.
These changes are only cosmetics to make them fit into the github review window.
Mic92
commented
Aug 18, 2020
| '' | ||
| # c++ includes come from gcc | ||
| + optionalString (gccForLibs.langCC or false) '' | ||
| echo "$(echo ${gccForLibs}/include/c++/*):$(echo ${gccForLibs}/include/c++/*/${targetPlatform.config})" \ |
There was a problem hiding this comment.
Am I correct that gcc only ever contains one directory at those levels?
no function change
At runtime in a nix-shell we want to find include paths used by the current c/c++ compiler for use in c/c++ tooling i.e. clangd/clang-tools.
This way it should respect the current environment instead of hard-coding what was used at build-time. Also only include c++ specific headers in CPLUS_INCLUDE_PATH as CPATH is respected for c++ as well according to clang(1).
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/get-clangd-to-find-standard-headers-in-nix-shell/11268/7 |
|
Closing this to encourage other folks to pick it up.... I luckily don't have to do c++... |
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.
Motivation for this change
It evaluate, but I need to test it actually.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)