diff options
Diffstat (limited to 'recipes/gcc')
-rw-r--r-- | recipes/gcc/gcc-configure-canadian-sdk.inc | 4 | ||||
-rw-r--r-- | recipes/gcc/gcc-configure-common.inc | 4 | ||||
-rw-r--r-- | recipes/gcc/gcc-configure-sdk.inc | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc index 5e27358d04..290f6965e7 100644 --- a/recipes/gcc/gcc-configure-canadian-sdk.inc +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc @@ -78,8 +78,8 @@ do_configure () { sed -i 's/^\(HOST_PPLLIBS =\) \(.*\)$/\1 -Wl,-Bstatic \2 -Wl,-Bdynamic/' ${S}/Makefile.in sed -i 's/^\(HOST_LIBELFLIBS =\) \(.*\)$/\1 -Wl,-Bstatic \2 -Wl,-Bdynamic/' ${S}/Makefile.tpl sed -i 's/^\(HOST_LIBELFLIBS =\) \(.*\)$/\1 -Wl,-Bstatic \2 -Wl,-Bdynamic/' ${S}/Makefile.in - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - (cd ${S}/libstdc++-v3 && autoreconf) + gnu_configize + (cd ${S}/libstdc++-v3 && oe_autoreconf) canadian_sdk_runconf } diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index fe0d32d39f..03f338d51d 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -92,8 +92,6 @@ do_configure () { sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.in sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe @@ -107,7 +105,7 @@ do_configure () { mv ${S}/gcc/defaults.h.new ${S}/gcc/defaults.h fi - oe_runconf + autotools_base_do_configure # make sure that no @LDFLAG@ is left in the generated Makefile sed -i "s/@LDFLAGS@//g" ${B}/Makefile diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc index c8fae11413..cb5e53b134 100644 --- a/recipes/gcc/gcc-configure-sdk.inc +++ b/recipes/gcc/gcc-configure-sdk.inc @@ -43,8 +43,7 @@ do_configure () { sed -i 's/^\(HOST_LIBELFLIBS =\) \(.*\)$/\1 -Wl,-Bstatic \2 -Wl,-Bdynamic/' ${S}/Makefile.tpl sed -i 's/^\(HOST_LIBELFLIBS =\) \(.*\)$/\1 -Wl,-Bstatic \2 -Wl,-Bdynamic/' ${S}/Makefile.in - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - oe_runconf + autotools_base_do_configure } do_compile () { |