diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-18 08:27:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-18 08:27:48 +0200 |
| commit | 8fc843472e764ce78c41d59134d72170a27facf9 (patch) | |
| tree | 0089137f23cb03b6b43aef1dc9e617d7883b0e06 /solenv | |
| parent | e669f70613ab1cad02e886aacc7a8d5df2550391 (diff) | |
More avoidance of invoking gdb with LD_LIBRARY_PATH set
...similar to 785eb0ed14cde731c2795f68f004f0b811cfe387 "gbuild: try to avoid
invoking gdb with LD_LIBRARY_PATH set", this time for DEBUGCPPUNIT=TRUE in
addition to CPPUNITTRACE="gdb --args"
Change-Id: I3e2cc5abf76947dc4c7b4d6caa3fd5720720e050
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 0b9478a509b6..5883ead35a9b 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -123,7 +123,7 @@ else ( \ $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \ $(if $(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \ - $(if $(filter gdb,$(CPPUNITTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \ + $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(gb_CppunitTest_malloc_check) \ diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index acc6ea2ba408..7bb58e4d73fc 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -122,7 +122,7 @@ endef # CppunitTest class ifeq ($(strip $(DEBUGCPPUNIT)),TRUE) -gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" --batch --command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result --args +gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" --batch --command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result --args endif # ExternalProject class |