Skip to content
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

Jump to bottom

Update DevKit build "bootstrap" to ensure all tooling comes from bootstrap #1043

Merged
merged 3 commits into from
Jun 19, 2024
Merged

Update DevKit build "bootstrap" to ensure all tooling comes from bootstrap #1043

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5ca50c
Explicitly set DevKit make bootstrap TOOLS
andrew-m-leonard Jun 5, 2024
65a357c
Explicitly set DevKit make bootstrap TOOLS
andrew-m-leonard Jun 5, 2024
431267b
Explicitly set DevKit make bootstrap TOOLS
andrew-m-leonard Jun 10, 2024
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
22 changes: 14 additions & 8 deletions pipelines/build/devkit/make_devkit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,23 @@ cd make/devkit && pwd && make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_O

# Move "bootstrap" devkit toolchain to a new folder and setup gcc toolchain to point at it
cd ../..
mv build/devkit/result/${devkit_target}-to-${devkit_target} build/bootstrap_${devkit_target}-to-${devkit_target}
export CC=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/bin/gcc
export CXX=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/bin/g++
export LD_LIBRARY_PATH=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/lib64
export PATH=$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}/bin:$PATH
gcc --version
BOOTSTRAP_DEVKIT="$(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}"
mv build/devkit/result/${devkit_target}-to-${devkit_target} ${BOOTSTRAP_DEVKIT}

# Make final "DevKit" using the bootstrap devkit
rm -rf build/devkit
echo "Building 'final' DevKit toolchain, using 'bootstrap' toolchain in $(pwd)/build/bootstrap_${devkit_target}-to-${devkit_target}"
cd make/devkit && pwd && make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_OS_VERSION=${BASE_OS_VERSION}
echo "Building 'final' DevKit toolchain, using 'bootstrap' toolchain in ${BOOTSTRAP_DEVKIT}"
cd make/devkit && pwd && \
LD_LIBRARY_PATH="${BOOTSTRAP_DEVKIT}/lib64:${BOOTSTRAP_DEVKIT}/lib" \
PATH="${BOOTSTRAP_DEVKIT}/bin:$PATH" \
make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_OS_VERSION=${BASE_OS_VERSION} \
CC=${BOOTSTRAP_DEVKIT}/bin/gcc \
CXX=${BOOTSTRAP_DEVKIT}/bin/g++ \
LD=${BOOTSTRAP_DEVKIT}/bin/ld \
AR=${BOOTSTRAP_DEVKIT}/bin/ar \
AS=${BOOTSTRAP_DEVKIT}/bin/as \
RANLIB=${BOOTSTRAP_DEVKIT}/bin/ranlib \
OBJDUMP=${BOOTSTRAP_DEVKIT}/bin/objdump

# Back to original folder
cd ../../..
Expand Down