diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-02-18 18:22:17 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-02-18 18:22:17 (GMT) |
| commit | 7d621cd831e4fb015fa151437051192135337006 (patch) | |
| tree | 7f1313ccc9112cb0bc1a231a33c5344e54ec2c94 /scripts/build/libc | |
| parent | fb744d81588395a97cee951a151a56501a500e42 (diff) | |
| parent | 8a61f74f38e33166f6be0dde0cae82cfe055c3bf (diff) | |
Merge pull request #1142 from stilor/rc2-fixes
Fixes for regressions in 1.24.0-rc1
Diffstat (limited to 'scripts/build/libc')
| -rw-r--r-- | scripts/build/libc/glibc.sh | 7 | ||||
| -rw-r--r-- | scripts/build/libc/mingw-w64.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc/moxiebox.sh | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 312c88f..aebc898 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -182,9 +182,6 @@ glibc_backend_once() touch config.cache - # Hide host C++ binary from configure - echo "ac_cv_prog_ac_ct_CXX=${CT_TARGET}-g++" >>config.cache - # Until it became explicitly controllable with --enable-stack-protector=..., # configure detected GCC support for -fstack-protector{,-strong} and # tried to enable it in some parts of glibc - which then failed to build. @@ -282,6 +279,10 @@ glibc_backend_once() "${CT_GLIBC_EXTRA_CONFIG_ARRAY[@]}" # build hacks + + # Mask C++ compiler. Glibc 2.29+ attempts to build some tests using gcc++, but + # we haven't built libstdc++ yet. Should really implement #808 after 1.24.0... + extra_make_args+=( CXX= ) case "${CT_ARCH},${CT_ARCH_CPU}" in powerpc,8??) # http://sourceware.org/ml/crossgcc/2008-10/msg00068.html diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh index 6e87073..a5b89d1 100644 --- a/scripts/build/libc/mingw-w64.sh +++ b/scripts/build/libc/mingw-w64.sh @@ -220,7 +220,3 @@ mingw_w64_main() CT_EndStep fi } - -mingw_w64_post_cc() { - : -} diff --git a/scripts/build/libc/moxiebox.sh b/scripts/build/libc/moxiebox.sh index f542187..25ef6e7 100644 --- a/scripts/build/libc/moxiebox.sh +++ b/scripts/build/libc/moxiebox.sh @@ -22,7 +22,10 @@ moxiebox_start_files() moxiebox_main() { newlib_main +} +moxiebox_post_cc() +{ CT_DoStep INFO "Installing moxiebox runtime and VM" CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-moxiebox" @@ -45,7 +48,7 @@ moxiebox_main() CT_DoExecLog CFG ./autogen.sh - # moxiebox build script create symlinks from the installation location to the build + # moxiebox build script creates symlinks from the installation location to the build # directory for the moxiebox library. This seems backwards. Instead, pass the search # as part of the MOX_GCC definition. # moxiebox also depends on the tools being named moxiebox-{gcc,as,ar}. However, failure |