summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2021-06-09 08:11:48 (GMT)
committerGitHub <noreply@github.com>2021-06-09 08:11:48 (GMT)
commit594b9286f41e2e5e6ef6cb68fe4c318aa6b7c808 (patch)
treebae136edcf5030610d9ed0606ba79d7836759244 /scripts/build
parente7139130295097ce05d9c7b3dcbb890c3a084975 (diff)
parent7144b5f275f380941bffca9509ecb97542c8e5ea (diff)
Merge pull request #1524 from stephanosio/gcc_custom_libstdcpp_cxx_flags_upstream
Fix libstdc++ build options
Diffstat (limited to 'scripts/build')
-rw-r--r--scripts/build/cc/gcc.sh41
-rw-r--r--scripts/build/companion_libs/350-newlib_nano.sh3
2 files changed, 39 insertions, 5 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index c505314..8aa7eeb 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -295,7 +295,8 @@ do_gcc_core_backend() {
local enable_optspace
local complibs
local lang_list
- local cflags cflags_for_build cflags_for_target
+ local cflags cflags_for_build cflags_for_target cxxflags_for_target
+ local extra_cxxflags_for_target
local ldflags
local build_step
local log_txt
@@ -614,6 +615,19 @@ do_gcc_core_backend() {
cflags_for_target="${cflags_for_target} -idirafter ${CT_HEADERS_DIR}"
fi
+ # Assume '-O2' by default for building target libraries.
+ cflags_for_target="-g -O2 ${cflags_for_target}"
+
+ # Set target CXXFLAGS to CFLAGS if none is provided.
+ if [ -z "${cxxflags_for_target}" ]; then
+ cxxflags_for_target="${cflags_for_target}"
+ fi
+
+ # Append extra CXXFLAGS if provided.
+ if [ -n "${extra_cxxflags_for_target}" ]; then
+ cxxflags_for_target="${cxxflags_for_target} ${extra_cxxflags_for_target}"
+ fi
+
# Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532).
# Pass only user-specified CFLAGS/LDFLAGS in CFLAGS_FOR_TARGET/LDFLAGS_FOR_TARGET: during
# the build of, for example, libatomic, GCC tried to compile multiple variants for runtime
@@ -627,7 +641,7 @@ do_gcc_core_backend() {
CXXFLAGS_FOR_BUILD="${cflags_for_build}" \
LDFLAGS="${core_LDFLAGS[*]}" \
CFLAGS_FOR_TARGET="${cflags_for_target}" \
- CXXFLAGS_FOR_TARGET="${cflags_for_target}" \
+ CXXFLAGS_FOR_TARGET="${cxxflags_for_target}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/gcc/configure" \
@@ -942,6 +956,9 @@ do_gcc_backend() {
local lang_list
local cflags
local cflags_for_build
+ local cflags_for_target
+ local cxxflags_for_target
+ local extra_cxxflags_for_target
local ldflags
local build_manuals
local exec_prefix
@@ -1212,8 +1229,9 @@ do_gcc_backend() {
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
- # We may need to modify host/build CFLAGS separately below
+ # We may need to modify host/build/target CFLAGS separately below
cflags_for_build="${cflags}"
+ cflags_for_target="${CT_TARGET_CFLAGS}"
# Clang's default bracket-depth is 256, and building GCC
# requires somewhere between 257 and 512.
@@ -1229,6 +1247,19 @@ do_gcc_backend() {
fi
fi
+ # Assume '-O2' by default for building target libraries.
+ cflags_for_target="-g -O2 ${cflags_for_target}"
+
+ # Set target CXXFLAGS to CFLAGS if none is provided.
+ if [ -z "${cxxflags_for_target}" ]; then
+ cxxflags_for_target="${cflags_for_target}"
+ fi
+
+ # Append extra CXXFLAGS if provided.
+ if [ -n "${extra_cxxflags_for_target}" ]; then
+ cxxflags_for_target="${cxxflags_for_target} ${extra_cxxflags_for_target}"
+ fi
+
# NB: not using CT_ALL_TARGET_CFLAGS/CT_ALL_TARGET_LDFLAGS here!
# See do_gcc_core_backend for explanation.
CT_DoExecLog CFG \
@@ -1238,8 +1269,8 @@ do_gcc_backend() {
CXXFLAGS="${cflags}" \
CXXFLAGS_FOR_BUILD="${cflags_for_build}" \
LDFLAGS="${final_LDFLAGS[*]}" \
- CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
- CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
+ CFLAGS_FOR_TARGET="${cflags_for_target}" \
+ CXXFLAGS_FOR_TARGET="${cxxflags_for_target}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/gcc/configure" \
diff --git a/scripts/build/companion_libs/350-newlib_nano.sh b/scripts/build/companion_libs/350-newlib_nano.sh
index d109070..2d9de1b 100644
--- a/scripts/build/companion_libs/350-newlib_nano.sh
+++ b/scripts/build/companion_libs/350-newlib_nano.sh
@@ -67,6 +67,9 @@ do_cc_libstdcxx_newlib_nano()
if [ "${CT_LIBC_NEWLIB_NANO_ENABLE_TARGET_OPTSPACE}" = "y" ]; then
final_opts+=( "enable_optspace=yes" )
fi
+ if [ -n "${CT_NEWLIB_NANO_GCC_LIBSTDCXX_TARGET_CXXFLAGS}" ]; then
+ final_opts+=( "extra_cxxflags_for_target=${CT_NEWLIB_NANO_GCC_LIBSTDCXX_TARGET_CXXFLAGS}" )
+ fi
if [ "${CT_BARE_METAL}" = "y" ]; then
final_opts+=( "mode=baremetal" )