MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-06 04:27:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'clang-target' into 'master'

Browse Source 
cmake: Use GNU_TARGET for clang target

See merge request redox-os/redox!2331
This commit is contained in:
Jeremy Soller 2026-09-07 07:46:55 -06:00
commit 05c0f80156
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -918,7 +918,7 @@ dependencies = [
[[package]]
name = "redoxer"
version = "0.2.63"
source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#5c74b7d78113bba19905225fe1a5d11adcc5c5a3"
source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#222c1a952172f7f900bea768ba44bb909add9809"
dependencies = [
"anyhow",
"dirs",

4
src/cook/script.rs
View File

@ -281,7 +281,7 @@ set(CMAKE_SYSTEM_NAME ${SYSTEM_NAME})
set(CMAKE_SYSTEM_PROCESSOR ${arch})
EOF
if [ "$target" = "$TARGET" ]
if [ "$target" = "$GNU_TARGET" ]
then
echo "set(CMAKE_C_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
echo "set(CMAKE_CXX_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
@ -301,7 +301,7 @@ function cookbook_cmake {
else
GCC_PREFIX=$GNU_TARGET-
fi
generate_cookbook_cmake_file "$TARGET" "$GCC_PREFIX" "$COOKBOOK_SYSROOT" cross_file.cmake
generate_cookbook_cmake_file "$GNU_TARGET" "$GCC_PREFIX" "$COOKBOOK_SYSROOT" cross_file.cmake
"${COOKBOOK_CMAKE}" "${COOKBOOK_SOURCE}" \
-DCMAKE_BUILD_TYPE=Release \