mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-24 08:09:22 +00:00
configure: Move adding of include options to the very end to avoid subshell.
This commit is contained in:
1 parent
86f05f1491
commit
b46bf3cd1c
1 file changed
+6
-3
+6
-3
@@ -78,12 +78,9 @@ fi
|
|||||||
|
|
||||||
# Default HOST_CPPFLAGS
|
# Default HOST_CPPFLAGS
|
||||||
HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
|
HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
|
||||||
HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
|
|
||||||
HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
|
HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
|
||||||
|
|
||||||
TARGET_CPPFLAGS="$TARGET_CPPFLAGS -Wall -W"
|
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
|
case "$target_cpu" in
|
||||||
i[[3456]]86) target_cpu=i386 ;;
|
i[[3456]]86) target_cpu=i386 ;;
|
||||||
@@ -1643,6 +1640,12 @@ fi
|
|||||||
TARGET_CPP="$TARGET_CC -E"
|
TARGET_CPP="$TARGET_CC -E"
|
||||||
TARGET_CCAS=$TARGET_CC
|
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_TARGET_CPU="${target_cpu}"
|
||||||
GRUB_PLATFORM="${platform}"
|
GRUB_PLATFORM="${platform}"
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user