Ver Fonte

* fix searching for fpc binary when specified on the cmdline

peter há 21 anos atrás
pai
commit
853152fdc2
2 ficheiros alterados com 166 adições e 159 exclusões
  1. 161 158
      utils/fpcm/fpcmake.inc
  2. 5 1
      utils/fpcm/fpcmake.ini

Diff do ficheiro suprimidas por serem muito extensas
+ 161 - 158
utils/fpcm/fpcmake.inc


+ 5 - 1
utils/fpcm/fpcmake.ini

@@ -176,11 +176,15 @@ endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 
 
-# Try to find the binary, if not found give an error
+# Try to find the binary direct first, otherwise in the path,
+# if not found give an error
 FOUNDFPC:=$(strip $(wildcard $(FPC)))
 FOUNDFPC:=$(strip $(wildcard $(FPC)))
 ifeq ($(FOUNDFPC),)
 ifeq ($(FOUNDFPC),)
+FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))
+ifeq ($(FOUNDFPC),)
 $(error Compiler $(FPC) not found)
 $(error Compiler $(FPC) not found)
 endif
 endif
+endif
 
 
 # For 1.1 and up we can use a single compiler call to retrieve
 # For 1.1 and up we can use a single compiler call to retrieve
 # all needed information
 # all needed information

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff