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

Merge branch 'clang-fixes' into 'master'

Browse Source 
Fix libpng, gperf, llvm build using clang

See merge request redox-os/redox!2339
This commit is contained in:
Jeremy Soller 2026-09-10 08:54:01 -06:00
commit 0f6c7de184
4 changed files with 8 additions and 5 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]] [[package]]
name = "redoxer" name = "redoxer"
version = "0.2.63" version = "0.2.63"
source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#222c1a952172f7f900bea768ba44bb909add9809" source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#af96492e69e0563c9d42847ec4f5a118e8ec6544"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dirs", "dirs",

2
recipes/libs/libpng/recipe.toml
View File

@ -13,5 +13,5 @@ template = "custom"
dependencies = ["zlib"] dependencies = ["zlib"]
script = """ script = """
DYNAMIC_STATIC_INIT DYNAMIC_STATIC_INIT
cookbook_configure cookbook_cmake
""" """

5
recipes/wip/dev/other/gperf/recipe.toml
View File

@ -1,6 +1,7 @@
#TODO Promote #TODO Promote
[source] [source]
tar = "https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz" tar = "https://ftp.gnu.org/gnu/gperf/gperf-3.3.tar.gz"
blake3 = "7023ada08089bb46d7c000af7a6eaded9b4cf0ec2d1018d28a1a1425a4ec5680" blake3 = "6ad90515e3b8ac191a8ecef4e75fbb260236f8e78078ac099d5eccc175af0782"
[build] [build]
template = "configure" template = "configure"

4
src/cook/script.rs
View File

@ -265,6 +265,8 @@ set(CMAKE_C_COMPILER_TARGET ${target})
set(CMAKE_CXX_COMPILER_TARGET ${target}) set(CMAKE_CXX_COMPILER_TARGET ${target})
set(CMAKE_ASM_COMPILER_TARGET ${target}) set(CMAKE_ASM_COMPILER_TARGET ${target})
EOF EOF
# redox clang workaround (see redoxer env)
CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }-stdlib=libstdc++"
fi fi
fi fi
@ -283,7 +285,7 @@ EOF
if [ "$target" = "$GNU_TARGET" ] if [ "$target" = "$GNU_TARGET" ]
then then
echo "set(CMAKE_C_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file echo "set(CMAKE_C_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
echo "set(CMAKE_CXX_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file echo "set(CMAKE_CXX_FLAGS \"${CXXFLAGS} ${CPPFLAGS}\")" >> $file
fi fi
if [ -n "${CC_WRAPPER}" ] if [ -n "${CC_WRAPPER}" ]