Skip to content

Fix Nix detection #773

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

Merged
merged 1 commit into from
Feb 14, 2022
Merged

Fix Nix detection #773

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildenv.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ else ifeq ($(MITIGATION-CVE-2020-0551), CF)
MITIGATION_LIB_PATH := cve_2020_0551_cf
endif

ifneq ($(origin NIX_PATH), environment)
ifneq ($(origin NIX_STORE), environment)
BINUTILS_DIR ?= /usr/local/bin
EXT_BINUTILS_DIR = $(ROOT_DIR)/external/toolset/$(DISTR_ID)$(DISTR_VER)
else
Expand Down
2 changes: 1 addition & 1 deletion external/ippcp_internal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ CHECK_SOURCE :=
# For reproducibility build in docker, the code should be
# prepared before build. So skip the code check to avoid
# triggering network request
ifneq ($(origin NIX_PATH), environment)
ifneq ($(origin NIX_STORE), environment)
ifneq ($(PATCH_LOG), SGX.)
CHECK_SOURCE:= ipp_source
endif
Expand Down