Make --register accept install root instead of bin directory

env.sh now appends /bin internally, so callers pass the install root
(e.g. build/install) consistently, both when using the default path
and when specifying it explicitly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-18 10:10:52 +03:00
parent 3bdde2147b
commit a0b70bd271
2 changed files with 11 additions and 11 deletions

View File

@@ -10,7 +10,7 @@ INSTALL_DIR="${TOP}/build/install"
INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
# Запускаем предварительно для того чтобы подтянуть переменные
. ./env.sh --register "${INSTALL_BIN_DIR}"
. ./env.sh --register "${INSTALL_DIR}"
# Сбрасываем CFLAGS/CXXFLAGS — все флаги уже встроены в CC/CXX
export CFLAGS=""
@@ -78,7 +78,7 @@ echo "== Распаковка завершена =="
# ==================================================================
cd ${TOP}
. ./env.sh --register "${INSTALL_BIN_DIR}" "rc"
. ./env.sh --register "${INSTALL_DIR}" "rc"
export CFLAGS=""
export CXXFLAGS=""
@@ -90,7 +90,7 @@ make install
# ==================================================================
cd ${TOP}
. ./env.sh --register "${INSTALL_BIN_DIR}"
. ./env.sh --register "${INSTALL_DIR}"
export CFLAGS=""
export CXXFLAGS=""