summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-08-12 22:05:51 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-08-12 22:05:51 (GMT)
commitb021021fecceb522f8f2454fb3bf096ad9ed6fe5 (patch)
treec1f0f5e470c183ce975d6b66d689d1c8dbe1c1d5 /scripts
parent37db634a000f70cfe90e2bf641926d722285ebf0 (diff)
libc/uClibc: force use of ctor/dtor
Although ctor/dtor do not seem strictly required, missing them proves rather inconvenient, as ld can't link binaries. Reported-by: John Spencer <maillist-uclibc@barfooze.de> (sh4rm4 on IRC) Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/libc/uClibc.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index abcbab2..87de620 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -365,6 +365,11 @@ mungeuClibcConfig() {
;;
esac
+ # We always want ctor/dtor
+ cat <<-ENDSED
+ s/^# (UCLIBC_CTOR_DTOR) is not set/\\1=y/
+ ENDSED
+
# Change paths to work with crosstool-NG
# From http://www.uclibc.org/cgi-bin/viewcvs.cgi?rev=16846&view=rev
# " we just want the kernel headers, not the whole kernel source ...
@@ -443,7 +448,6 @@ mungeuClibcConfig() {
if [ "${CT_CC_LANG_CXX}" = "y" ]; then
cat <<-ENDSED
s/^# DO_C99_MATH is not set/DO_C99_MATH=y/
- s/^# UCLIBC_CTOR_DTOR is not set/UCLIBC_CTOR_DTOR=y/
s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/
ENDSED
fi