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

Move CMake's staging directory outside OUTPUT_DIR #1044

Merged
merged 1 commit into from
Feb 9, 2020
Merged

Move CMake's staging directory outside OUTPUT_DIR #1044

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
4 changes: 3 additions & 1 deletion Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,8 @@ else
MACHINE=$(TARGET_MARCHINE)
endif
OUTPUT_DIR=build/$(MACHINE)
# We'll want a machine-specific staging directory *outside* of OUTPUT_DIR, so we don't pickup random build artifacts in packages...
CMAKE_STAGING_DIR=build/staging-$(MACHINE)

# you can configure an emulation for the (eink) framebuffer here.
# the application won't use the framebuffer (and the special e-ink ioctls)
Expand Down Expand Up @@ -533,7 +535,7 @@ else
ifndef SYSROOT
export SYSROOT:=$(shell PATH='$(PATH)' $(CC) -print-sysroot)
endif
export CROSS_STAGING:=$(CURDIR)/$(OUTPUT_DIR)
export CROSS_STAGING:=$(CMAKE_STAGING_DIR)
export CMAKE_TCF:=-DCMAKE_TOOLCHAIN_FILE=$(CURDIR)/thirdparty/cmake_modules/CMakeCross.cmake
CMAKE+=$(CMAKE_TCF)
ifdef CCACHE
Expand Down