Refactor env.sh to improve registration and unregistration handling for toolchain environment
This commit is contained in:
@@ -8,7 +8,7 @@ INSTALL_DIR="${TOP}/build/install"
|
||||
INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
|
||||
|
||||
# Запускаем предварительно для того чтобы подтянуть переменные
|
||||
. ./env.sh "${INSTALL_BIN_DIR}"
|
||||
. ./env.sh --register "${INSTALL_BIN_DIR}"
|
||||
|
||||
# Сбрасываем CFLAGS/CXXFLAGS — все флаги уже встроены в CC/CXX
|
||||
export CFLAGS=""
|
||||
@@ -76,7 +76,7 @@ echo "== Распаковка завершена =="
|
||||
# ==================================================================
|
||||
|
||||
cd ${TOP}
|
||||
. ./env.sh "${INSTALL_BIN_DIR}" "rc"
|
||||
. ./env.sh --register "${INSTALL_BIN_DIR}" "rc"
|
||||
export CFLAGS=""
|
||||
export CXXFLAGS=""
|
||||
|
||||
@@ -88,7 +88,7 @@ make install
|
||||
# ==================================================================
|
||||
|
||||
cd ${TOP}
|
||||
. ./env.sh "${INSTALL_BIN_DIR}"
|
||||
. ./env.sh --register "${INSTALL_BIN_DIR}"
|
||||
export CFLAGS=""
|
||||
export CXXFLAGS=""
|
||||
|
||||
@@ -167,4 +167,9 @@ cmake -S .. -B . \
|
||||
-DZLIB_USE_STATIC=ON
|
||||
|
||||
make -j$(nproc)
|
||||
make install
|
||||
make install
|
||||
|
||||
# ==================================================================
|
||||
|
||||
cd ${TOP}
|
||||
. ./env.sh --unregister
|
||||
Reference in New Issue
Block a user