mirror of
https://github.com/SerenityOS/serenity
synced 2024-09-06 17:06:31 +00:00
Toolchain: Fix macOS build failure due to a malformed patch
Discord user aesophor pointed out that the GCC toolchain fails to build on macOS, and traced the issue back to41ea37f2
, which is the latest change to `gcc.patch`. Similarly, when I tried to run BuildIt.sh in the `--dev` mode, `git apply` complained about the patch being malformed. I regenerated the patch by manually applying the changes of41ea37f2
on top of a known good GCC source tree, and I sent the new file to them. They reported that this fixed the build issue they were having.
This commit is contained in:
parent
d45931b423
commit
20e29c403e
|
@ -348,7 +348,7 @@ index 5095b6830..d19942eee 100644
|
||||||
&& defined(TARGET_DL_ITERATE_PHDR) \
|
&& defined(TARGET_DL_ITERATE_PHDR) \
|
||||||
&& defined(__linux__)
|
&& defined(__linux__)
|
||||||
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||||
index 326a279c5..6b76901dc 100755
|
index 326a279c5..4379c25c8 100755
|
||||||
--- a/libstdc++-v3/configure
|
--- a/libstdc++-v3/configure
|
||||||
+++ b/libstdc++-v3/configure
|
+++ b/libstdc++-v3/configure
|
||||||
@@ -4219,15 +4219,7 @@ printf ("hello world\n");
|
@@ -4219,15 +4219,7 @@ printf ("hello world\n");
|
||||||
|
@ -368,16 +368,14 @@ index 326a279c5..6b76901dc 100755
|
||||||
if test x$gcc_no_link = xyes; then
|
if test x$gcc_no_link = xyes; then
|
||||||
# Setting cross_compile will disable run tests; it will
|
# Setting cross_compile will disable run tests; it will
|
||||||
# also disable AC_CHECK_FILE but that's generally
|
# also disable AC_CHECK_FILE but that's generally
|
||||||
@@ -29264,6 +29256,5 @@ if
|
@@ -29264,12 +29256,5990 @@ else
|
||||||
|
|
||||||
$as_echo "#define HAVE_ICONV 1" >>confdefs.h
|
$as_echo "#define HAVE_ICONV 1" >>confdefs.h
|
||||||
|
|
||||||
- $as_echo "#define HAVE_MEMALIGN 1" >>confdefs.h
|
- $as_echo "#define HAVE_MEMALIGN 1" >>confdefs.h
|
||||||
|
-
|
||||||
else
|
else
|
||||||
|
|
||||||
@@ -29270,6 +29261,5986 @@ else
|
|
||||||
|
|
||||||
# Base decisions on target environment.
|
# Base decisions on target environment.
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
+
|
+
|
||||||
|
|
Loading…
Reference in a new issue