Kaydet (Commit) 16b10d9a authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Christian Lohmaier

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/56380Reviewed-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
üst 7f1f1f53
...@@ -34,11 +34,12 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\ ...@@ -34,11 +34,12 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
endif endif
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 # 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),GCC)
ifeq ($(COM_IS_CLANG),) ifeq ($(COM_IS_CLANG),)
ifeq ($(CPUNAME),INTEL) ifeq ($(CPUNAME),INTEL)
ifeq ($(shell expr '$(GCC_VERSION)' '<' 483),1) ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1)
ifeq ($(shell expr '$(GCC_VERSION)' '>=' 480),1) ifeq ($(shell expr '$(GCC_VERSION)' '>=' 408),1)
$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
-march=i586 \ -march=i586 \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment