diff --git a/.buildkite/ci.yml b/.buildkite/ci.yml index 8551a21936..43301ee1bd 100644 --- a/.buildkite/ci.yml +++ b/.buildkite/ci.yml @@ -1105,7 +1105,7 @@ steps: - key: "bun-windows-x64-build-bun" label: ":windows: x64 - build-bun" depends_on: - - "bun-windows-x64-build-no-lto" + - "bun-windows-x64-build-bun-no-lto" agents: queue: "build-windows" os: "windows" diff --git a/CMakeLists.txt b/CMakeLists.txt index 95e1f6a44f..60df3e6e9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -614,7 +614,7 @@ set(BUN_DEPS_DIR "${BUN_SRC}/deps") set(BUN_CODEGEN_SRC "${BUN_SRC}/codegen") if(NOT BUN_DEPS_OUT_DIR) - set(BUN_DEPS_OUT_DIR "${BUN_DEPS_DIR}") + set(BUN_DEPS_OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/bun-deps") endif() set(BUN_RAW_SOURCES, "") diff --git a/Makefile b/Makefile index 5ffca73ee4..37e1775b2a 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ SED = $(shell which gsed 2>/dev/null || which sed 2>/dev/null) BUN_DIR ?= $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) BUN_DEPS_DIR ?= $(shell pwd)/src/deps -BUN_DEPS_OUT_DIR ?= $(BUN_DEPS_DIR) +BUN_DEPS_OUT_DIR ?= $(shell pwd)/build/bun-deps CPU_COUNT = 2 ifeq ($(OS_NAME),darwin) CPU_COUNT = $(shell sysctl -n hw.logicalcpu)