Skip to content

Commit

Permalink
Move CMake's staging directory outside OUTPUT_DIR (#1044)
Browse files Browse the repository at this point in the history
Otherwise, we're picking it up in the final packages

We've been shipping extra bits of jpeg-turbo & zsync2 because of that,
which explains why the tarball's size has suddenly ballooned...
  • Loading branch information
NiLuJe committed Feb 9, 2020
1 parent dc65873 commit d12a54e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile.defs
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

0 comments on commit d12a54e

Please sign in to comment.