fix merge

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
2021-08-05 17:33:52 +02:00
14 changed files with 790 additions and 2 deletions

View File

@@ -668,14 +668,23 @@ CT_GDB_7_0_or_later=y
CT_GDB_CROSS=y
# CT_GDB_CROSS_STATIC is not set
# CT_GDB_CROSS_SIM is not set
<<<<<<< HEAD
# CT_GDB_CROSS_PYTHON is not set
=======
CT_GDB_CROSS_PYTHON=n
CT_GDB_CROSS_PYTHON_BINARY=""
>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
CT_GDB_NATIVE=y
CT_GDB_GDBSERVER=y
# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
CT_GDB_HAS_PKGVERSION_BUGURL=y
<<<<<<< HEAD
# CT_GDB_HAS_PYTHON is not set
=======
CT_GDB_HAS_PYTHON=n
>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
CT_GDB_INSTALL_GDBINIT=y
CT_GDB_HAS_IPA_LIB=y
CT_DEBUG_LTRACE=y