system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Toolchain: Build demangling into LibC except during toolchain build

Browse source
This commit is contained in:
Andreas Kling 2020-02-21 18:54:57 +01:00
parent 59c052a72a
commit c4c1ad2289
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AK/Demangle.h
View file

@ -28,7 +28,7 @@
#include <AK/String.h>
#ifndef SERENITY_LIBC_BUILD
#ifndef BUILDING_SERENITY_TOOLCHAIN
#include <cxxabi.h>
#endif
@ -36,7 +36,7 @@ namespace AK {
inline String demangle(const StringView& name)
{
#ifdef SERENITY_LIBC_BUILD
#ifdef BUILDING_SERENITY_TOOLCHAIN
return name;
#else
int status = 0;

2
Libraries/LibC/Makefile
View file

@ -81,7 +81,7 @@ crtn.o: crtin.ao
EXTRA_CLEAN = crt0.d crt0.o
DEFINES = -DSERENITY_LIBC_BUILD
DEFINES = -DSERENITY_LIBC_BUILD $(EXTRA_LIBC_DEFINES)
LIBRARY = libc.a

2
Toolchain/BuildIt.sh
View file

@ -148,7 +148,7 @@ pushd "$DIR/Build/"
"$MAKE" install-gcc install-target-libgcc || exit 1
echo "XXX serenity libc and libm"
( cd "$DIR/../Libraries/LibC/" && "$MAKE" clean && "$MAKE" && "$MAKE" install )
( cd "$DIR/../Libraries/LibC/" && "$MAKE" clean && "$MAKE" EXTRA_LIBC_DEFINES="-DBUILDING_SERENITY_TOOLCHAIN" && "$MAKE" install )
( cd "$DIR/../Libraries/LibM/" && "$MAKE" clean && "$MAKE" && "$MAKE" install )
echo "XXX build libstdc++"