44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From b46bf3cd1c3682df0a6460dcee95ce4d9da4d1fd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
||
|
|
Date: Fri, 20 Feb 2015 21:30:34 +0100
|
||
|
|
Subject: [PATCH 296/506] configure: Move adding of include options to the very
|
||
|
|
end to avoid subshell.
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 9 ++++++---
|
||
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 9f54158..8945afa 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -78,12 +78,9 @@ fi
|
||
|
|
|
||
|
|
# Default HOST_CPPFLAGS
|
||
|
|
HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
|
||
|
|
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
|
||
|
|
HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
|
||
|
|
|
||
|
|
TARGET_CPPFLAGS="$TARGET_CPPFLAGS -Wall -W"
|
||
|
|
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
|
||
|
|
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
|
||
|
|
|
||
|
|
case "$target_cpu" in
|
||
|
|
i[[3456]]86) target_cpu=i386 ;;
|
||
|
|
@@ -1643,6 +1640,12 @@ fi
|
||
|
|
TARGET_CPP="$TARGET_CC -E"
|
||
|
|
TARGET_CCAS=$TARGET_CC
|
||
|
|
|
||
|
|
+# Includes which include make-time substitutions. They must come last
|
||
|
|
+# as to avoid executing top_builddir in shell.
|
||
|
|
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
|
||
|
|
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
|
||
|
|
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
|
||
|
|
+
|
||
|
|
GRUB_TARGET_CPU="${target_cpu}"
|
||
|
|
GRUB_PLATFORM="${platform}"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.4.3
|
||
|
|
|