ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable linker on release-builder

Browse Source
This commit is contained in:
tequ
2025-11-28 00:25:13 +09:00
parent 0b896d34e3
commit 7f8eac93db
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/xahau-ga-nix.yml vendored
View File

@@ -5,7 +5,6 @@ on:
branches: ["dev", "candidate", "release"] branches: ["dev", "candidate", "release"]
pull_request: pull_request:
branches: ["dev", "candidate", "release"] branches: ["dev", "candidate", "release"]
workflow_dispatch:
schedule: schedule:
- cron: '0 0 * * *' - cron: '0 0 * * *'
@@ -280,9 +279,6 @@ jobs:
pipx install "conan>=2.0,<3" pipx install "conan>=2.0,<3"
echo "$HOME/.local/bin" >> $GITHUB_PATH echo "$HOME/.local/bin" >> $GITHUB_PATH
# # Add ccache PATH
# echo "/usr/lib/ccache" >> $GITHUB_PATH
- name: Check environment - name: Check environment
run: | run: |
echo "PATH:" echo "PATH:"

5
build-full.sh
View File

@@ -67,9 +67,8 @@ fi
# Environment setup moved to Dockerfile in release-builder.sh # Environment setup moved to Dockerfile in release-builder.sh
source /opt/rh/gcc-toolset-11/enable source /opt/rh/gcc-toolset-11/enable
export PATH=/usr/local/bin:$PATH export PATH=/usr/local/bin:$PATH
export CC='ccache gcc' && export PATH=/usr/lib/ccache:$PATH
export CXX='ccache g++' && echo "-- Build Rippled --"
echo "-- Build Rippled --" &&
pwd && pwd &&
echo "MOVING TO [ build-core.sh ]"; echo "MOVING TO [ build-core.sh ]";

4
release-builder.sh
View File

@@ -128,9 +128,6 @@ ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++"
ENV LLVM_DIR=/usr/lib64/llvm14/lib/cmake/llvm ENV LLVM_DIR=/usr/lib64/llvm14/lib/cmake/llvm
ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a
ENV CC='ccache gcc'
ENV CXX='ccache g++'
# Install LLD # Install LLD
RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \ RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
cd /tmp && \ cd /tmp && \
@@ -189,6 +186,7 @@ RUN cd /tmp && \
# Set environment variables # Set environment variables
ENV PATH=/usr/local/bin:$PATH ENV PATH=/usr/local/bin:$PATH
ENV PATH=/usr/lib/ccache:$PATH
# Configure ccache and Conan 2 # Configure ccache and Conan 2
# NOTE: Using echo commands instead of heredocs because heredocs in Docker RUN commands are finnicky # NOTE: Using echo commands instead of heredocs because heredocs in Docker RUN commands are finnicky