diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-26 08:30:20 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-26 08:30:20 -0600 |
| commit | 435288caca4aeac2258dd87a431c254d340c9929 (patch) | |
| tree | bfab58026da391f8087f7f573492e91e1cecbac5 /pkgs/development/compilers | |
| parent | 044c65bd06e969411f2771e093cf89fd42bbbaf5 (diff) | |
| download | nixlib-435288caca4aeac2258dd87a431c254d340c9929.tar nixlib-435288caca4aeac2258dd87a431c254d340c9929.tar.gz nixlib-435288caca4aeac2258dd87a431c254d340c9929.tar.bz2 nixlib-435288caca4aeac2258dd87a431c254d340c9929.tar.lz nixlib-435288caca4aeac2258dd87a431c254d340c9929.tar.xz nixlib-435288caca4aeac2258dd87a431c254d340c9929.tar.zst nixlib-435288caca4aeac2258dd87a431c254d340c9929.zip | |
llvm_4: fix cosmetic issue in help output
Can be observed in programs like "llvm-link".
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/4/cmdline-help.patch | 39 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 3 |
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/4/cmdline-help.patch b/pkgs/development/compilers/llvm/4/cmdline-help.patch new file mode 100644 index 000000000000..a693719c2cfa --- /dev/null +++ b/pkgs/development/compilers/llvm/4/cmdline-help.patch @@ -0,0 +1,39 @@ +From c7a9aa3a697c81432786a5583bf973771c7be15e Mon Sep 17 00:00:00 2001 +From: Don Hinton <hintonda@gmail.com> +Date: Wed, 12 Jul 2017 01:15:46 +0000 +Subject: [PATCH] Fix minor typo introduced in r276404 + +Summary: +A space was added between '-' and 'help' when emitting help output. + +See https://reviews.llvm.org/D22621 for details. + +Reviewers: MaggieYi, vsk + +Reviewed By: vsk + +Subscribers: llvm-commits + +Differential Revision: https://reviews.llvm.org/D35283 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307745 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Support/CommandLine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp +index 3889902eea5..79defa5c36c 100644 +--- a/lib/Support/CommandLine.cpp ++++ b/lib/Support/CommandLine.cpp +@@ -1236,7 +1236,7 @@ bool CommandLineParser::ParseCommandLineOptions(int argc, + << ": Not enough positional command line arguments specified!\n" + << "Must specify at least " << NumPositionalRequired + << " positional argument" << (NumPositionalRequired > 1 ? "s" : "") +- << ": See: " << argv[0] << " - help\n"; ++ << ": See: " << argv[0] << " -help\n"; + } + + ErrorParsing = true; +-- +2.14.0 + diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 7fd94316d738..787175b859c5 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -78,6 +78,9 @@ in stdenv.mkDerivation (rec { substituteInPlace lib/esan/esan_sideline_linux.cpp \ --replace 'struct sigaltstack' 'stack_t' ) + '' + # Fix extra space printed in commandline help sometimes, "- help" + '' + patch -p1 -i ${./cmdline-help.patch} '' + stdenv.lib.optionalString stdenv.isAarch64 '' patch -p0 < ${../aarch64.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' |