1 |
From 70e4530eefdb2cecc37fff91235e716ed76f2da2 Mon Sep 17 00:00:00 2001 |
2 |
From: Paolo Bonzini <pbonzini@redhat.com> |
3 |
Date: Thu, 16 Aug 2018 15:45:47 -0400 |
4 |
Subject: [PATCH] Tweak the tools_def to support cross-compiling. |
5 |
|
6 |
These files are meant for customization, so this is not upstream. |
7 |
|
8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
9 |
Signed-off-by: Cole Robinson <crobinso@redhat.com> |
10 |
--- |
11 |
BaseTools/Conf/tools_def.template | 44 +++++++++++++++---------------- |
12 |
1 file changed, 22 insertions(+), 22 deletions(-) |
13 |
|
14 |
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template |
15 |
index 7bf682ffa9..ad1bbcbdc6 100755 |
16 |
--- a/BaseTools/Conf/tools_def.template |
17 |
+++ b/BaseTools/Conf/tools_def.template |
18 |
@@ -3517,17 +3517,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 |
19 |
##################
|
20 |
# GCC5 IA32 definitions
|
21 |
##################
|
22 |
-*_GCC5_IA32_OBJCOPY_PATH = DEF(GCC5_IA32_PREFIX)objcopy
|
23 |
-*_GCC5_IA32_CC_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
24 |
-*_GCC5_IA32_SLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc-ar
|
25 |
-*_GCC5_IA32_DLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
26 |
-*_GCC5_IA32_ASLDLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
27 |
-*_GCC5_IA32_ASM_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
28 |
-*_GCC5_IA32_PP_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
29 |
-*_GCC5_IA32_VFRPP_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
30 |
-*_GCC5_IA32_ASLCC_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
31 |
-*_GCC5_IA32_ASLPP_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
32 |
-*_GCC5_IA32_RC_PATH = DEF(GCC5_IA32_PREFIX)objcopy
|
33 |
+*_GCC5_IA32_OBJCOPY_PATH = ENV(GCC5_IA32_PREFIX)objcopy
|
34 |
+*_GCC5_IA32_CC_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
35 |
+*_GCC5_IA32_SLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc-ar
|
36 |
+*_GCC5_IA32_DLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
37 |
+*_GCC5_IA32_ASLDLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
38 |
+*_GCC5_IA32_ASM_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
39 |
+*_GCC5_IA32_PP_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
40 |
+*_GCC5_IA32_VFRPP_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
41 |
+*_GCC5_IA32_ASLCC_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
42 |
+*_GCC5_IA32_ASLPP_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
43 |
+*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy
|
44 |
|
45 |
*_GCC5_IA32_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m32
|
46 |
*_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -no-pie
|
47 |
@@ -3549,17 +3549,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, |
48 |
##################
|
49 |
# GCC5 X64 definitions
|
50 |
##################
|
51 |
-*_GCC5_X64_OBJCOPY_PATH = DEF(GCC5_X64_PREFIX)objcopy
|
52 |
-*_GCC5_X64_CC_PATH = DEF(GCC5_X64_PREFIX)gcc
|
53 |
-*_GCC5_X64_SLINK_PATH = DEF(GCC5_X64_PREFIX)gcc-ar
|
54 |
-*_GCC5_X64_DLINK_PATH = DEF(GCC5_X64_PREFIX)gcc
|
55 |
-*_GCC5_X64_ASLDLINK_PATH = DEF(GCC5_X64_PREFIX)gcc
|
56 |
-*_GCC5_X64_ASM_PATH = DEF(GCC5_X64_PREFIX)gcc
|
57 |
-*_GCC5_X64_PP_PATH = DEF(GCC5_X64_PREFIX)gcc
|
58 |
-*_GCC5_X64_VFRPP_PATH = DEF(GCC5_X64_PREFIX)gcc
|
59 |
-*_GCC5_X64_ASLCC_PATH = DEF(GCC5_X64_PREFIX)gcc
|
60 |
-*_GCC5_X64_ASLPP_PATH = DEF(GCC5_X64_PREFIX)gcc
|
61 |
-*_GCC5_X64_RC_PATH = DEF(GCC5_X64_PREFIX)objcopy
|
62 |
+*_GCC5_X64_OBJCOPY_PATH = ENV(GCC5_X64_PREFIX)objcopy
|
63 |
+*_GCC5_X64_CC_PATH = ENV(GCC5_X64_PREFIX)gcc
|
64 |
+*_GCC5_X64_SLINK_PATH = ENV(GCC5_X64_PREFIX)gcc-ar
|
65 |
+*_GCC5_X64_DLINK_PATH = ENV(GCC5_X64_PREFIX)gcc
|
66 |
+*_GCC5_X64_ASLDLINK_PATH = ENV(GCC5_X64_PREFIX)gcc
|
67 |
+*_GCC5_X64_ASM_PATH = ENV(GCC5_X64_PREFIX)gcc
|
68 |
+*_GCC5_X64_PP_PATH = ENV(GCC5_X64_PREFIX)gcc
|
69 |
+*_GCC5_X64_VFRPP_PATH = ENV(GCC5_X64_PREFIX)gcc
|
70 |
+*_GCC5_X64_ASLCC_PATH = ENV(GCC5_X64_PREFIX)gcc
|
71 |
+*_GCC5_X64_ASLPP_PATH = ENV(GCC5_X64_PREFIX)gcc
|
72 |
+*_GCC5_X64_RC_PATH = ENV(GCC5_X64_PREFIX)objcopy
|
73 |
|
74 |
*_GCC5_X64_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m64
|
75 |
*_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|