Toolchain: Build demangling into LibC except during toolchain build

fleximus · Feb 21, 2020 · c4c1ad2 · c4c1ad2
1 parent 59c052a
commit c4c1ad2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/AK/Demangle.h b/AK/Demangle.h
@@ -28,15 +28,15 @@
 
 #include <AK/String.h>
 
-#ifndef SERENITY_LIBC_BUILD
+#ifndef BUILDING_SERENITY_TOOLCHAIN
 #include <cxxabi.h>
 #endif
 
 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
@@ -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
@@ -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++"