packages: fix the cross-build breakages caused by the overlapping sp argument added in r34680 and a wrong fix attempt in r34684

git-svn-id: trunk@34685 -

packages/Makefile

@@ -1696,6 +1696,9 @@ FPMAKE_OPT+=$(FPC_TARGETOPT)
 FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))
 FPMAKE_OPT+=--compiler=$(FPC)
 FPMAKE_OPT+=-bu
+ifndef BUILDFULLNATIVE
+FPMAKE_OPT+=-scp
+endif
 .NOTPARALLEL:
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap

packages/Makefile.fpc

@@ -63,6 +63,9 @@ FPMAKE_OPT+=$(FPC_TARGETOPT)
 FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))
 FPMAKE_OPT+=--compiler=$(FPC)
 FPMAKE_OPT+=-bu
+ifndef BUILDFULLNATIVE
+FPMAKE_OPT+=-scp
+endif
 .NOTPARALLEL:
 
 fpmkunit_clean_bootstrap:

packages/fpmkunit/src/fpmkunit.pp

@@ -4835,7 +4835,7 @@ begin
       DefaultsFileName:=OptionArg(I)
     else if CheckOption(I,'ie','installexamples') then
       Defaults.InstallExamples:=true
-    else if CheckOption(I,'sp','skipcrossprograms') then
+    else if CheckOption(I,'scp','skipcrossprograms') then
       Defaults.SkipCrossPrograms:=true
     else if CheckOption(I,'bu','buildunit') then
       Defaults.BuildMode:=bmBuildUnit