This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
RFA: Update dejagnu/lib/libgloss.exp for libstdc++-v3
- From: Nick Clifton <nickc at cambridge dot redhat dot com>
- To: newlib at sources dot redhat dot com, gdb-patches at sources dot redhat dot com
- Date: 16 Jan 2002 17:51:30 +0000
- Subject: RFA: Update dejagnu/lib/libgloss.exp for libstdc++-v3
Hi Guys,
The g++_include_flags and libstdc+++include_flags procs in the
dejagnu library libgloss.exp have not been updated to work the with
the new libstdc++-v3 sources. The patch below adds this support,
putting the v3 paths before the old (v2 ?) paths, so that if both
libraries are present the new one will be used.
May I apply this patch ?
Cheers
Nick
2002-01-16 Nick Clifton <nickc@cambridge.redhat.com>
* lib/libgloss.exp (g++_include_flags): Add libstdc++-v3
include paths.
(libstdc++_include_flags): Add libstdc++-v3 include paths.
Index: dejagnu/lib/libgloss.exp
===================================================================
RCS file: /cvs/src/src/dejagnu/lib/libgloss.exp,v
retrieving revision 1.3
diff -c -3 -p -w -r1.3 libgloss.exp
*** libgloss.exp 2001/11/19 16:25:58 1.3
--- libgloss.exp 2002/01/16 17:43:51
*************** proc libio_link_flags { args } {
*** 210,215 ****
--- 214,220 ----
proc g++_include_flags { args } {
global srcdir
+ global target_alias
if [is_remote host] {
return ""
*************** proc g++_include_flags { args } {
*** 223,232 ****
--- 228,254 ----
if { ${dir} != "" } {
append flags " -I${dir} -I${dir}/src"
}
+
+ set dir [lookfor_file ${srcdir} libstdc++-v3]
+ if { ${dir} != "" } {
+ append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++"
+ }
+
+ set dir [lookfor_file ${gccpath} libstdc++-v3]
+ if { ${dir} != "" } {
+ append flags " -I${dir}/include/${target_alias}"
+ }
+
+ set dir [lookfor_file ${srcdir} libstdc++-v3]
+ if { ${dir} != "" } {
+ append flags " -I${dir}/include -I${dir}/include/std"
+ }
+
set dir [lookfor_file ${srcdir} libstdc++]
if { ${dir} != "" } {
append flags " -I${dir} -I${dir}/stl"
}
+
return "$flags"
}
*************** proc g++_link_flags { args } {
*** 288,293 ****
--- 310,316 ----
proc libstdc++_include_flags { args } {
global srcdir
+ global target_alias
if [is_remote host] {
return ""
*************** proc libstdc++_include_flags { args } {
*** 297,306 ****
--- 320,342 ----
set libio_dir ""
set flags ""
+ set dir [lookfor_file ${srcdir} libstdc++-v3]
+ if { ${dir} != "" } {
+ append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++"
+ }
+
+ set gccpath [get_multilibs]
+
+ set dir [lookfor_file ${gccpath} libstdc++-v3]
+ if { ${dir} != "" } {
+ append flags " -I${dir}/include/${target_alias}"
+ }
+
set dir [lookfor_file ${srcdir} libstdc++]
if { ${dir} != "" } {
append flags " -I${dir} -I${dir}/stl"
}
+
return "$flags"
}