diff options
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index b50cc1d06a..0bf26b5c62 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -80,6 +80,16 @@ ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ | |||
80 | ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ | 80 | ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ |
81 | " | 81 | " |
82 | 82 | ||
83 | python do_preconfigure () { | ||
84 | import subprocess | ||
85 | cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') | ||
86 | subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) | ||
87 | # See 0044-gengtypes.patch, we need to regenerate this file | ||
88 | bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) | ||
89 | } | ||
90 | addtask do_preconfigure after do_patch before do_configure | ||
91 | do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" | ||
92 | |||
83 | # | 93 | # |
84 | # Set some default values | 94 | # Set some default values |
85 | # | 95 | # |
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 48fb7995ca..f33678c75a 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -93,16 +93,6 @@ _EOF | |||
93 | mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h | 93 | mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h |
94 | } | 94 | } |
95 | 95 | ||
96 | python do_preconfigure () { | ||
97 | import subprocess | ||
98 | cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') | ||
99 | subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) | ||
100 | # See 0044-gengtypes.patch, we need to regenerate this file | ||
101 | bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) | ||
102 | } | ||
103 | addtask do_preconfigure after do_patch before do_configure | ||
104 | do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" | ||
105 | |||
106 | do_configure () { | 96 | do_configure () { |
107 | # Setup these vars for cross building only | 97 | # Setup these vars for cross building only |
108 | # ... because foo_FOR_TARGET apparently gets misinterpreted inside the | 98 | # ... because foo_FOR_TARGET apparently gets misinterpreted inside the |