Merge pull request #224 from stilor/ltrace

Ltrace
crosstool-ng · Oct 27, 2015 · 195f6f2 · 195f6f2
2 parents 7d3ef02 + 0a050d3
commit 195f6f2
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 0 deletions.
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -20,4 +20,5 @@ CT_DEBUG_gdb=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -25,4 +25,5 @@ CT_DEBUG_duma=y
 CT_DEBUG_gdb=y
 CT_GDB_CROSS_STATIC=y
 CT_GDB_NATIVE=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -17,4 +17,5 @@ CT_DEBUG_duma=y
 CT_DEBUG_gdb=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -20,4 +20,5 @@ CT_DEBUG_gdb=y
 CT_GDB_CROSS_STATIC=y
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -23,4 +23,5 @@ CT_DEBUG_gdb=y
 CT_GDB_CROSS_STATIC=y
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -18,4 +18,5 @@ CT_DEBUG_duma=y
 CT_DEBUG_gdb=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -16,4 +16,5 @@ CT_DEBUG_duma=y
 CT_DEBUG_gdb=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
+CT_DEBUG_ltrace=y
 CT_DEBUG_strace=y
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
@@ -535,6 +535,16 @@ do_gcc_core_backend() {
     CT_DoLog EXTRA "Installing ${log_txt}"
     CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} ${core_targets_install}
 
+    # Remove the libtool "pseudo-libraries": having them in the installed
+    # tree makes the libtoolized utilities that are built next assume
+    # that, for example, libsupc++ is an "accessory library", and not include
+    # -lsupc++ to the link flags. That breaks ltrace, for example.
+    CT_DoLog EXTRA "Housekeeping for final gcc compiler"
+    CT_Pushd "${prefix}"
+    find . -type f -name "*.la" -exec rm {} \; |CT_DoLog ALL
+    CT_Popd
+
+
     if [ "${build_manuals}" = "yes" ]; then
         CT_DoLog EXTRA "Building the GCC manuals"
         CT_DoExecLog ALL make pdf html
@@ -932,6 +942,15 @@ do_gcc_backend() {
     CT_DoLog EXTRA "Installing final gcc compiler"
     CT_DoExecLog ALL make ${JOBSFLAGS} install
 
+    # Remove the libtool "pseudo-libraries": having them in the installed
+    # tree makes the libtoolized utilities that are built next assume
+    # that, for example, libsupc++ is an "accessory library", and not include
+    # -lsupc++ to the link flags. That breaks ltrace, for example.
+    CT_DoLog EXTRA "Housekeeping for final gcc compiler"
+    CT_Pushd "${prefix}"
+    find . -type f -name "*.la" -exec rm {} \; |CT_DoLog ALL
+    CT_Popd
+
     if [ "${build_manuals}" = "yes" ]; then
         CT_DoLog EXTRA "Building the GCC manuals"
         CT_DoExecLog ALL make pdf html