48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From 7a2729ee7f5d9b9d4a0d9b83fe641a2ab03c4ee0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Joe Slater <joe.slater@windriver.com>
|
||
|
|
Date: Thu, 24 Feb 2022 17:36:59 -0800
|
||
|
|
Subject: [PATCH 1/2] configure: use correct CPP
|
||
|
|
|
||
|
|
configure uses CPP to test that two assembler routines
|
||
|
|
can be built. Unfortunately, it will use /usr/bin/cpp
|
||
|
|
if it exists, invalidating the tests. We use the $CC
|
||
|
|
passed to configure.
|
||
|
|
|
||
|
|
Upstream-Status: Inappropriate [openembedded specific]
|
||
|
|
|
||
|
|
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||
|
|
---
|
||
|
|
unix/configure | 15 +++++++++------
|
||
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/unix/configure b/unix/configure
|
||
|
|
index 73ba803..7e21070 100644
|
||
|
|
--- a/unix/configure
|
||
|
|
+++ b/unix/configure
|
||
|
|
@@ -220,13 +220,16 @@ fi
|
||
|
|
echo Check for the C preprocessor
|
||
|
|
# on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
|
||
|
|
CPP="${CC} -E"
|
||
|
|
+
|
||
|
|
+# We should not change CPP for yocto builds.
|
||
|
|
+#
|
||
|
|
# solaris as(1) needs -P, maybe others as well ?
|
||
|
|
-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
|
||
|
|
-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
|
||
|
|
-[ -f /lib/cpp ] && CPP=/lib/cpp
|
||
|
|
-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
|
||
|
|
-[ -f /xenix ] && CPP="${CC} -E"
|
||
|
|
-[ -f /lynx.os ] && CPP="${CC} -E"
|
||
|
|
+# [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
|
||
|
|
+# [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
|
||
|
|
+# [ -f /lib/cpp ] && CPP=/lib/cpp
|
||
|
|
+# [ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
|
||
|
|
+# [ -f /xenix ] && CPP="${CC} -E"
|
||
|
|
+# [ -f /lynx.os ] && CPP="${CC} -E"
|
||
|
|
|
||
|
|
echo "#include <stdio.h>" > conftest.c
|
||
|
|
$CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
|
||
|
|
--
|
||
|
|
2.24.1
|
||
|
|
|