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 -
This commit is contained in:
Károly Balogh 2016-10-09 06:03:32 +00:00
parent c5ae6027ca
commit 710da4cc13
3 changed files with 7 additions and 1 deletions

View File

@ -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

View File

@ -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:

View File

@ -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