diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-01-04 09:43:00 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-01-04 09:51:10 +0900 |
| commit | 68317c736e29b72387ed05be99492340df4eaf22 (patch) | |
| tree | 0634a0b3cdda6113d895ed883fd1404494bc2413 /pkgs | |
| parent | 45179675a9a231d457cbac98db92c192794af1b1 (diff) | |
| download | nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.tar nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.tar.gz nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.tar.bz2 nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.tar.lz nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.tar.xz nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.tar.zst nixpkgs-68317c736e29b72387ed05be99492340df4eaf22.zip | |
perl: fix configure phase for Aarch32
In "perl: fuse configureFlags" [1] the effects of the preConfigure
phase were merged into configureFlags. After this change values with
spaces do not reach the configure script intact.
The only flag this affects is `ldflags` for Aarch32 and Mips, and perl
builds without it on armv7l-linux so it's probably no longer required
on any platform.
Fixes:
configuring
configure flags: -de -Dcc=cc <...> -Dldflags=\"-lm -lrt\"
./Configure: eval: line 1677: unexpected EOF while looking for matching `"'
./Configure: eval: line 1678: syntax error: unexpected end of file
Configure: unknown option -lrt"
[1] 3b50d0462a4174bb155b258a32ab1ab4176ba2fc
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3231c17e8d9..751b9667a1f 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -96,8 +96,7 @@ let "-Dprefix=${placeholder "out"}" "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" - ] - ++ optional (stdenv.isAarch32 || stdenv.isMips) "-Dldflags=\"-lm -lrt\""; + ]; configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; |