[oe-commits] org.oe.dev gcc3-build-cross.inc: don't add -lgcc_s for avr32

[koen commit]

gcc3-build-cross.inc: don't add -lgcc_s for avr32

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 0ae0ada5d1f6dee946772c48a60b567a6605d5e1
ViewMTN: http://monotone.openembedded.org/revision/info/0ae0ada5d1f6dee946772c48a60b567a6605d5e1
Files:
1
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc3-build-cross.inc
Diffs:

#
# mt diff -rcf454642d00e63809fda626604a54fdbc88584ce -r0ae0ada5d1f6dee946772c48a60b567a6605d5e1
#
#
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [6f6c037d27c55d3999ec21bc550af351c1c63b85]
#    to [1daac30e7ea4fb5cbd39972b2b2176ac74e625f1]
# 
# patch "packages/gcc/gcc3-build-cross.inc"
#  from [5d07bedf9a0e89893e190e81c7733cbe6d78177b]
#    to [ea02bd6b782d5b89affb50171080a13da3b91248]
#
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb	6f6c037d27c55d3999ec21bc550af351c1c63b85
+++ packages/gcc/gcc-cross_4.2.1.bb	1daac30e7ea4fb5cbd39972b2b2176ac74e625f1
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r12"
+PR = "r13"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc3-build-cross.inc	5d07bedf9a0e89893e190e81c7733cbe6d78177b
+++ packages/gcc/gcc3-build-cross.inc	ea02bd6b782d5b89affb50171080a13da3b91248
@@ -18,6 +18,9 @@ do_compile_prepend () {
 	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
 }
 
+LIBGCCS_VAR = "-lgcc_s"
+LIBGCCS_VAR_avr32 = ""
+
 do_stage_append () {
 	for d in info man share/doc share/locale ; do
 		rm -rf ${CROSS_DIR}/$d
@@ -44,6 +47,6 @@ do_stage_append () {
 	done
 
 	#fix up libsupc++ and libstdc++ la files
-	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib -lgcc_s -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la || true
-	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib -lgcc_s -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la || true
+	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la || true
+	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la || true
 }