From c4c1ad22893ba796d0e82185db500c712e51ef82 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Fri, 21 Feb 2020 18:54:57 +0100
Subject: [PATCH] Toolchain: Build demangling into LibC except during toolchain
 build

---
 AK/Demangle.h           | 4 ++--
 Libraries/LibC/Makefile | 2 +-
 Toolchain/BuildIt.sh    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AK/Demangle.h b/AK/Demangle.h
index bc422f5f6b..722c32b477 100644
--- a/AK/Demangle.h
+++ b/AK/Demangle.h
@@ -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;
diff --git a/Libraries/LibC/Makefile b/Libraries/LibC/Makefile
index 067a4d73c6..71acff8ace 100644
--- a/Libraries/LibC/Makefile
+++ b/Libraries/LibC/Makefile
@@ -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
 
diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh
index 66b66c76b8..6eb6c3a4c9 100755
--- a/Toolchain/BuildIt.sh
+++ b/Toolchain/BuildIt.sh
@@ -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++"