Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/core

sc/Library_vbaobj.mk

@@ -138,7 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
 ))
 
 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255
-ifeq ($(strip $(COM)),GCC)
+ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-INTEL)
 gccthunkBroken := $(shell expr $(gb_CCVER) \>= 40500 \& $(gb_CCVER) \< 40602)
 endif
 

solenv/bin/install-gdb-printers

@@ -49,13 +49,14 @@ make_autoload() {
         mkdir -p "${dir}" || die "cannot create dir '${dir}'"
     fi
 
-    [[ -f ${lib}-gdb.py ]] && rm -f "${lib}-gdb.py"
     if ${link}; then
-        if [[ ! -f ${lib}-gdb.py ]]; then
+        if [[ ${dir} != ${SOLVERLIBDIR} ]]; then
             local gdbname="${lib##*/}-gdb.py"
+            [[ -f ${dir}/${gdbname} ]] && rm -f "${dir}/${gdbname}"
             ln -s "${SOLVERLIBDIR}/${gdbname}" "${dir}/${gdbname}"
         fi
     else
+        [[ -f ${lib}-gdb.py ]] && rm -f "${lib}-gdb.py"
         sed -e "s!%PYTHONDIR%!${pythondir}!" -e "s!%MODULE%!libreoffice.$1!" \
             "${GDBDIR}/autoload.template" > "${lib}-gdb.py"
     fi