Quellcode durchsuchen

* fpmake also needs to know subtarget

Michael VAN CANNEYT vor 2 Jahren
Ursprung
Commit
dab26c70bb
1 geänderte Dateien mit 7 neuen und 2 gelöschten Zeilen
  1. 7 2
      utils/fpcm/fpcmake.ini

+ 7 - 2
utils/fpcm/fpcmake.ini

@@ -291,9 +291,9 @@ endif
 
 ifdef SUB_TARGET 
 override FPCOPT+=-t$(SUB_TARGET)
+override FPMAKE_OPT+=--subtarget=$(SUB_TARGET)
 endif
 
-
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(SUBARCH),)
 # we don't add a default here, people should explicitly add the SUBARCH
@@ -2516,6 +2516,9 @@ endif
 ifdef CPU_TARGET
 FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+ifdef SUB_TARGET
+FPC_TARGETOPT+=--subtarget=$(SUB_TARGET)
+endif
 
 # Get the location of the bootstrap-fpmkunit units
 PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2549,7 +2552,9 @@ FPMAKE_OPT+=$(FPC_TARGETOPT)
 FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))
 FPMAKE_OPT+=--compiler=$(FPC)
 FPMAKE_OPT+=-bu
-
+ifdef SUB_TARGET
+FPMAKE_OPT+=--subtarget=$(SUB_TARGET)
+endif
 FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)
 ifdef UNIXHier
 FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)