Skip to content
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.

Sign up for GitHub

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

Jump to bottom

llvm-stdenv: fix default stdlib #28870

Closed
wants to merge 1 commit into from
Closed

llvm-stdenv: fix default stdlib #28870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkgs/build-support/cc-wrapper/add-flags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ var_templates=(
NIX+ENFORCE_NO_NATIVE
)

# Include the default stdlib unless is defined NIX_CXXSTDLIB_COMPILE.
export NIX_CXXSTDLIB_COMPILE=${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}

# Accumulate infixes for taking in the right input parameters. See setup-hook
# for details.
declare -a role_infixes=()
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/cc-wrapper/cc-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ fi

if [[ "$isCpp" = 1 ]]; then
if [[ "$cppInclude" = 1 ]]; then
NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
NIX_@infixSalt@_CFLAGS_COMPILE+=" $NIX_@infixSalt@_CXXSTDLIB_COMPILE"
fi
NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK"
fi
Expand Down