Browse Source

Use GCCLIBDIR variable for FPCMAKEGCCLIBDIR if FPCFPMAKE has same target cpu as CPU_TARGET

git-svn-id: trunk@45352 -
pierre 5 years ago
parent
commit
5ffc1b8152
1 changed files with 11 additions and 0 deletions
  1. 11 0
      utils/fpcm/fpcmake.ini

+ 11 - 0
utils/fpcm/fpcmake.ini

@@ -870,7 +870,18 @@ endif
 endif
 endif
 endif
 endif
 
 
+# Check if FPCFPMAKE compiler is same target as FPC
+ifdef FPCFPMAKE
+FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+# In that case use GCCLIBDIR value for FPCMAKEGCCLIBDIR
+FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+endif
+endif
+
+ifndef FPCMAKEGCCLIBDIR
 FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
+endif
 
 
 # Try cross gcc
 # Try cross gcc
 ifndef GCCLIBDIR
 ifndef GCCLIBDIR