diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-11-04 20:54:34 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-11-04 20:54:34 +0000 |
| commit | c74f66baa235b6972d76a3922102ecb855c92c9f (patch) | |
| tree | e5fc23cf3c7619a46c3f8457c45ad30328fa374f /utils | |
| parent | e4bfdbd12a0eb5205a930ff6f01a795e95dfed86 (diff) | |
| download | fpc-c74f66baa235b6972d76a3922102ecb855c92c9f.tar.gz | |
--- Merging r32071 into '.':
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32071 into '.':
U .
# revisions: 32071
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32238 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fppkg/fppkg.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/utils/fppkg/fppkg.pp b/utils/fppkg/fppkg.pp index 34c77d4d59..231f0c5be7 100644 --- a/utils/fppkg/fppkg.pp +++ b/utils/fppkg/fppkg.pp @@ -82,6 +82,7 @@ procedure TMakeTool.ShowUsage; begin Writeln('Usage: ',Paramstr(0),' [options] <action> <package>'); Writeln('Options:'); + Writeln(' -C --config-file Specify the configuration file to use'); Writeln(' -c --config Set compiler configuration to use'); Writeln(' -h --help This help'); Writeln(' -v --verbose Show more information'); @@ -195,7 +196,12 @@ begin begin Inc(I); // Check options. - if CheckOption(I,'c','config') then + if CheckOption(I,'C','config-file') then + begin + // Do nothing, the config-file has already been read. + OptionArg(I); + end + else if CheckOption(I,'c','config') then GlobalOptions.CompilerConfig:=OptionArg(I) else if CheckOption(I,'v','verbose') then LogLevels:=AllLogLevels |