summaryrefslogtreecommitdiff
path: root/external/poppler
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-06-25 11:30:09 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-06-25 13:00:39 +0200
commit16b10d9ac976d40daffee1d15456016f4a89cd2e (patch)
treeaefea26c38b49add1d8efab222846dfd15edd213 /external/poppler
parent7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610 (diff)
poppler: fix incorrect GCC_VERSION check
The minor version is encoded into the last 2 digits, the micro version is not avialable. Change-Id: I4eee40511d732ec8cfc8d85943b965bb6e06d66e Reviewed-on: https://gerrit.libreoffice.org/56380 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
Diffstat (limited to 'external/poppler')
-rw-r--r--external/poppler/StaticLibrary_poppler.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
index 08bc66eeadbd..f145b7ae9c39 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -34,11 +34,12 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
endif
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
+# can't easily check for 4.8.2 exactly so just apply to GCC 4.8.x
ifeq ($(COM),GCC)
ifeq ($(COM_IS_CLANG),)
ifeq ($(CPUNAME),INTEL)
-ifeq ($(shell expr '$(GCC_VERSION)' '<' 483),1)
-ifeq ($(shell expr '$(GCC_VERSION)' '>=' 480),1)
+ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1)
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 408),1)
$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
-march=i586 \
))