mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-22 09:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Meta+Toolchain: Move the jakt runtime files into the Toolchain build dir

Browse source 
These files are all static libs and source code, and aren't needed to be
present at runtime inside the image.
This commit is contained in:
Ali Mohammad Pur 2024-11-10 02:11:52 +01:00 committed by Ali Mohammad Pur
parent 352f879993
commit 9d11d82e2c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Meta/CMake/jakt.cmake
View file

@ -23,10 +23,10 @@ if(${PROJECT_NAME} STREQUAL "Lagom")
set(JAKT_TARGET_TRIPLE ${arch}-unknown-${os}-unknown)
set(JAKT_LIBRARY_BASE "${SerenityOS_SOURCE_DIR}/Toolchain/Local/jakt/lib")
else()
set(JAKT_LIBRARY_BASE "${CMAKE_SYSROOT}/usr/local/lib")
set(JAKT_LIBRARY_BASE "${SerenityOS_SOURCE_DIR}/Toolchain/Local/jakt/usr/local/lib")
endif()
set(JAKT_LIBRARY_DIR "${JAKT_LIBRARY_BASE}/${JAKT_TARGET_TRIPLE}")
set(JAKT_INCLUDE_DIR "${CMAKE_SYSROOT}/usr/local/include/runtime")
set(JAKT_INCLUDE_DIR "${SerenityOS_SOURCE_DIR}/Toolchain/Local/jakt/usr/local/include/runtime")
# Make sure the jakt compiler:
# - exists

6
Toolchain/BuildJakt.sh
View file

@ -255,15 +255,15 @@ build_for() {
buildstep "jakt/support/build/$TOOLCHAIN" "$PREFIX/bin/jakt" cross \
--only-support-libs \
--install-root "$SYSROOT/usr/local" \
--install-root "$PREFIX/usr/local" \
--target-triple "$JAKT_TARGET" \
--target-links-ak \
-C "$TARGET_CXX" \
-O \
-J "$NPROC"
buildstep "jakt/support/build/$TOOLCHAIN/ranlib" "$TARGET_RANLIB" "$SYSROOT/usr/local/lib/$JAKT_TARGET/libjakt_runtime_$JAKT_TARGET.a"
buildstep "jakt/support/build/$TOOLCHAIN/ranlib" "$TARGET_RANLIB" "$SYSROOT/usr/local/lib/$JAKT_TARGET/libjakt_main_$JAKT_TARGET.a"
buildstep "jakt/support/build/$TOOLCHAIN/ranlib" "$TARGET_RANLIB" "$PREFIX/usr/local/lib/$JAKT_TARGET/libjakt_runtime_$JAKT_TARGET.a"
buildstep "jakt/support/build/$TOOLCHAIN/ranlib" "$TARGET_RANLIB" "$PREFIX/usr/local/lib/$JAKT_TARGET/libjakt_main_$JAKT_TARGET.a"
popd
}