Skip to content

[ATfL] Fix LOG_DIR vs. LOGS_DIR inconsistency #78

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

Merged
merged 1 commit into from
Feb 10, 2025
Merged

[ATfL] Fix LOG_DIR vs. LOGS_DIR inconsistency #78

Show file tree
Hide file tree
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
44 changes: 22 additions & 22 deletions arm-software/linux/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LIBRARIES_DIR=${LIBRARIES_DIR:-"${BASE_DIR}/lib"}
PATCHES_DIR=${PATCHES_DIR:-"${BASE_DIR}/patches"}
BUILD_DIR=${BUILD_DIR:-"${BASE_DIR}/build"}
ATFL_DIR=${ATFL_DIR:-"${BUILD_DIR}/atfl"}
LOG_DIR=${LOGS_DIR:-"${BASE_DIR}/logs"}
LOGS_DIR=${LOGS_DIR:-"${BASE_DIR}/logs"}
OUTPUT_DIR=${OUTPUT_DIR:-"${BASE_DIR}/output"}

#########################
Expand Down Expand Up @@ -177,8 +177,8 @@ Environment Variables:
(default: $PATCHES_DIR)
BUILD_DIR The directory where all build output will be stored
(default: $BUILD_DIR)
LOG_DIR The directory where all build logs will be stored
(default: $LOG_DIR)
LOGS_DIR The directory where all build logs will be stored
(default: $LOGS_DIR)
OUTPUT_DIR The directory where all build output will be stored
(default: $OUTPUT_DIR)
RELEASE_FLAGS Enable release flags in the build true/false
Expand Down Expand Up @@ -259,13 +259,13 @@ bootstrap_compiler_build() {
-DCOMPILER_RT_USE_LLVM_UNWINDER=ON \
-DCOMPILER_RT_ENABLE_STATIC_UNWINDER=ON \
"${COMMON_CMAKE_FLAGS[@]}" "${LIBUNWIND_NOSHARED_CMAKE_FLAGS[@]}" 2>&1 |
tee "${LOG_DIR}/bootstrap_compiler.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOG_DIR}/bootstrap_compiler.txt"
run_command cmake --install . 2>&1 | tee -a "${LOG_DIR}/bootstrap_compiler.txt"
tee "${LOGS_DIR}/bootstrap_compiler.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOGS_DIR}/bootstrap_compiler.txt"
run_command cmake --install . 2>&1 | tee -a "${LOGS_DIR}/bootstrap_compiler.txt"
export PATH="${BUILD_DIR}/bootstrap_compiler/bin:$PATH"
echo "-fuse-ld=lld" >${BUILD_DIR}/bootstrap_compiler/bin/clang.cfg
echo "-fuse-ld=lld" >${BUILD_DIR}/bootstrap_compiler/bin/clang++.cfg
run_command ninja ${NINJA_ARGS} check-all 2>&1 | tee -a "${LOG_DIR}/bootstrap_compiler.txt"
run_command ninja ${NINJA_ARGS} check-all 2>&1 | tee -a "${LOGS_DIR}/bootstrap_compiler.txt"
}

libcpp_build() {
Expand Down Expand Up @@ -302,12 +302,12 @@ libcpp_build() {
-DLIBCXX_ENABLE_UNICODE=ON \
-DLIBCXX_ENABLE_WIDE_CHARACTERS=ON \
"${COMMON_CMAKE_FLAGS[@]}" "${PRODUCT_CMAKE_FLAGS[@]}" "${LIBUNWIND_NOSHARED_CMAKE_FLAGS[@]}" 2>&1 |
tee "${LOG_DIR}/libcpp.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOG_DIR}/libcpp.txt"
run_command cmake --install . 2>&1 | tee -a "${LOG_DIR}/libcpp.txt"
tee "${LOGS_DIR}/libcpp.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOGS_DIR}/libcpp.txt"
run_command cmake --install . 2>&1 | tee -a "${LOGS_DIR}/libcpp.txt"
export LD_LIBRARY_PATH="${ATFL_DIR}/lib:$LD_LIBRARY_PATH"
run_command ninja ${NINJA_ARGS} check-cxx 2>&1 | tee -a "${LOG_DIR}/libcpp.txt"
run_command ninja ${NINJA_ARGS} check-cxxabi 2>&1 | tee -a "${LOG_DIR}/libcpp.txt"
run_command ninja ${NINJA_ARGS} check-cxx 2>&1 | tee -a "${LOGS_DIR}/libcpp.txt"
run_command ninja ${NINJA_ARGS} check-cxxabi 2>&1 | tee -a "${LOGS_DIR}/libcpp.txt"
}

product_build() {
Expand All @@ -324,10 +324,10 @@ product_build() {
-DBUILD_SHARED_LIBS=False \
-DLIBOMP_ENABLE_SHARED=True \
"${COMMON_CMAKE_FLAGS[@]}" "${PRODUCT_CMAKE_FLAGS[@]}" "${COMPILER_CMAKE_FLAGS[@]}" "${LIBUNWIND_SHARED_CMAKE_FLAGS[@]}" ${extra_flags} 2>&1 |
tee "${LOG_DIR}/product.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOG_DIR}/product.txt"
run_command cmake --install . 2>&1 | tee -a "${LOG_DIR}/product.txt"
run_command ninja ${NINJA_ARGS} check-all | tee -a "${LOG_DIR}/product.txt"
tee "${LOGS_DIR}/product.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOGS_DIR}/product.txt"
run_command cmake --install . 2>&1 | tee -a "${LOGS_DIR}/product.txt"
run_command ninja ${NINJA_ARGS} check-all | tee -a "${LOGS_DIR}/product.txt"
}

shared_lib_build() {
Expand All @@ -344,11 +344,11 @@ shared_lib_build() {
-DBUILD_SHARED_LIBS=True \
-DLIBOMP_ENABLE_SHARED=False \
"${COMMON_CMAKE_FLAGS[@]}" "${PRODUCT_CMAKE_FLAGS[@]}" "${COMPILER_CMAKE_FLAGS[@]}" "${LIBUNWIND_SHARED_CMAKE_FLAGS[@]}" ${extra_flags} 2>&1 |
tee "${LOG_DIR}/shared_lib.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOG_DIR}/shared_lib.txt"
tee "${LOGS_DIR}/shared_lib.txt"
run_command cmake --build . ${CMAKE_BUILD_ARGS} 2>&1 | tee -a "${LOGS_DIR}/shared_lib.txt"
rm -rf "${ATFL_DIR}.keep" "${ATFL_DIR}.libs"
mv "${ATFL_DIR}" "${ATFL_DIR}.keep"
run_command cmake --install . 2>&1 | tee -a "${LOG_DIR}/shared_lib.txt"
run_command cmake --install . 2>&1 | tee -a "${LOGS_DIR}/shared_lib.txt"
mv "${ATFL_DIR}" "${ATFL_DIR}.libs"
mv "${ATFL_DIR}.keep" "${ATFL_DIR}"
cp "${ATFL_DIR}.libs/lib/aarch64-unknown-linux-gnu/libomp.a" \
Expand All @@ -360,7 +360,7 @@ shared_lib_build() {
rm -r "${ATFL_DIR}.libs"
echo '-L<CFGDIR>/../runtimes/runtimes-bins/openmp/runtime/src $-Wl,--push-state $-Wl,--as-needed $-lomp $-ldl $-Wl,--pop-state' >bin/clang.cfg
echo '-L<CFGDIR>/../runtimes/runtimes-bins/openmp/runtime/src $-Wl,--push-state $-Wl,--as-needed $-lomp $-ldl $-Wl,--pop-state' >bin/clang++.cfg
run_command ninja ${NINJA_ARGS} check-all | tee -a "${LOG_DIR}/shared_lib.txt"
run_command ninja ${NINJA_ARGS} check-all | tee -a "${LOGS_DIR}/shared_lib.txt"
}

package() {
Expand Down Expand Up @@ -401,7 +401,7 @@ package() {
echo "-frtlib-add-rpath @atfl-performance.cfg" > flang.cfg
cd -
run_command tar --owner=root --group=root -czf "$OUTPUT_DIR/$TAR_NAME" -C "$BUILD_DIR" atfl |
tee "${LOG_DIR}/package.txt"
tee "${LOGS_DIR}/package.txt"
}

################
Expand Down Expand Up @@ -477,7 +477,7 @@ fi

mkdir -p "${BUILD_DIR}"
mkdir -p "${OUTPUT_DIR}"
mkdir -p "${LOG_DIR}"
mkdir -p "${LOGS_DIR}"

main
trap : 0
Expand Down
2 changes: 1 addition & 1 deletion arm-software/linux/build.sh-HOWTO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ The `build.sh` script reads the following environment variables:
(default: `arm-software/linux/patches`)
- `BUILD_DIR` - The directory where all build will be happening
(default: `arm-software/linux/build`)
- `LOG_DIR` - The directory where all build logs will be stored
- `LOGS_DIR` - The directory where all build logs will be stored
(default: `arm-software/linux/logs`)
- `OUTPUT_DIR` - The directory where all build output will be stored
(default: `arm-software/linux/output`)
Expand Down