mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Fix libpng, gperf, llvm build using clang
This commit is contained in:
parent
c2c4f032b0
commit
e6f6ec836f
@ -13,5 +13,5 @@ template = "custom"
|
||||
dependencies = ["zlib"]
|
||||
script = """
|
||||
DYNAMIC_STATIC_INIT
|
||||
cookbook_configure
|
||||
cookbook_cmake
|
||||
"""
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#TODO Promote
|
||||
[source]
|
||||
tar = "https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz"
|
||||
blake3 = "7023ada08089bb46d7c000af7a6eaded9b4cf0ec2d1018d28a1a1425a4ec5680"
|
||||
tar = "https://ftp.gnu.org/gnu/gperf/gperf-3.3.tar.gz"
|
||||
blake3 = "6ad90515e3b8ac191a8ecef4e75fbb260236f8e78078ac099d5eccc175af0782"
|
||||
|
||||
[build]
|
||||
template = "configure"
|
||||
|
||||
@ -265,6 +265,8 @@ set(CMAKE_C_COMPILER_TARGET ${target})
|
||||
set(CMAKE_CXX_COMPILER_TARGET ${target})
|
||||
set(CMAKE_ASM_COMPILER_TARGET ${target})
|
||||
EOF
|
||||
# redox clang workaround (see redoxer env)
|
||||
CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }-stdlib=libstdc++"
|
||||
fi
|
||||
|
||||
fi
|
||||
@ -283,7 +285,7 @@ EOF
|
||||
if [ "$target" = "$GNU_TARGET" ]
|
||||
then
|
||||
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
|
||||
|
||||
if [ -n "${CC_WRAPPER}" ]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user