ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-21 09:21:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #634 from stilor/macos-canadian

Browse Source 
A couple of fixes for canadian samples on macos
This commit is contained in:
Alexey Neyman 2017-03-07 08:51:35 -08:00 committed by GitHub
commit 456cccc0a7
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/build/cc/100-gcc.sh
View File

@ -340,6 +340,7 @@ do_gcc_core_backend() {
local complibs local complibs
local lang_list local lang_list
local cflags local cflags
local cflags_for_build
local ldflags local ldflags
local build_step local build_step
local log_txt local log_txt
@ -579,17 +580,30 @@ do_gcc_core_backend() {
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
# We may need to modify host/build CFLAGS separately below
cflags_for_build="${cflags}"
# Clang's default bracket-depth is 256, and building GCC # Clang's default bracket-depth is 256, and building GCC
# requires somewhere between 257 and 512. # requires somewhere between 257 and 512.
if ${CT_BUILD}-gcc --version 2>&1 | grep clang; then if [ "${host}" = "${CT_BUILD}" ]; then
cflags="$cflags "-fbracket-depth=512 if ${CT_BUILD}-gcc --version 2>&1 | grep clang; then
cflags="$cflags "-fbracket-depth=512
cflags_for_build="$cflags_for_build "-fbracket-depth=512
fi
else
# FIXME we currently don't support clang as host compiler, only as build
if ${CT_BUILD}-gcc --version 2>&1 | grep clang; then
cflags_for_build="$cflags_for_build "-fbracket-depth=512
fi
fi fi
# Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532) # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
CT_DoExecLog CFG \ CT_DoExecLog CFG \
CC_FOR_BUILD="${CT_BUILD}-gcc" \ CC_FOR_BUILD="${CT_BUILD}-gcc" \
CFLAGS="${cflags}" \ CFLAGS="${cflags}" \
CFLAGS_FOR_BUILD="${cflags_for_build}" \
CXXFLAGS="${cflags}" \ CXXFLAGS="${cflags}" \
CXXFLAGS_FOR_BUILD="${cflags_for_build}" \
LDFLAGS="${core_LDFLAGS[*]}" \ LDFLAGS="${core_LDFLAGS[*]}" \
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
@ -867,6 +881,7 @@ do_gcc_backend() {
local complibs local complibs
local lang_list local lang_list
local cflags local cflags
local cflags_for_build
local ldflags local ldflags
local build_manuals local build_manuals
local -a host_libstdcxx_flags local -a host_libstdcxx_flags
@ -1102,16 +1117,29 @@ do_gcc_backend() {
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
# We may need to modify host/build CFLAGS separately below
cflags_for_build="${cflags}"
# Clang's default bracket-depth is 256, and building GCC # Clang's default bracket-depth is 256, and building GCC
# requires somewhere between 257 and 512. # requires somewhere between 257 and 512.
if ${CT_BUILD}-gcc --version 2>&1 | grep clang; then if [ "${host}" = "${CT_BUILD}" ]; then
cflags="$cflags "-fbracket-depth=512 if ${CT_BUILD}-gcc --version 2>&1 | grep clang; then
cflags="$cflags "-fbracket-depth=512
cflags_for_build="$cflags_for_build "-fbracket-depth=512
fi
else
# FIXME we currently don't support clang as host compiler, only as build
if ${CT_BUILD}-gcc --version 2>&1 | grep clang; then
cflags_for_build="$cflags_for_build "-fbracket-depth=512
fi
fi fi
CT_DoExecLog CFG \ CT_DoExecLog CFG \
CC_FOR_BUILD="${CT_BUILD}-gcc" \ CC_FOR_BUILD="${CT_BUILD}-gcc" \
CFLAGS="${cflags}" \ CFLAGS="${cflags}" \
CFLAGS_FOR_BUILD="${cflags_for_build}" \
CXXFLAGS="${cflags}" \ CXXFLAGS="${cflags}" \
CXXFLAGS_FOR_BUILD="${cflags_for_build}" \
LDFLAGS="${final_LDFLAGS[*]}" \ LDFLAGS="${final_LDFLAGS[*]}" \
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \

2
scripts/build/companion_libs/050-zlib.sh
View File

@ -86,7 +86,7 @@ do_zlib_backend() {
CT_DoExecLog CFG \ CT_DoExecLog CFG \
CFLAGS="${cflags}" \ CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \ LDFLAGS="${ldflags}" \
CROSS_PREFIX="${host}-" \ CHOST="${host}" \
${CONFIG_SHELL} \ ${CONFIG_SHELL} \
"${CT_SRC_DIR}/zlib-${CT_ZLIB_VERSION}/configure" \ "${CT_SRC_DIR}/zlib-${CT_ZLIB_VERSION}/configure" \
--prefix="${prefix}" \ --prefix="${prefix}" \