eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #3708 from p01arst0rm/extern-char-fix

Browse source 
appended ' __attribute__((weak)); ' to 'extern char * * environ '
This commit is contained in:
Eelco Dolstra 2020-06-17 10:33:42 +02:00 committed by GitHub
commit ea5bcfb59b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/util.cc
View file

@ -35,7 +35,7 @@
#endif
extern char * * environ;
extern char * * environ __attribute__((weak));
namespace nix {

2
src/nix-build/nix-build.cc
View file

@ -21,7 +21,7 @@
using namespace nix;
using namespace std::string_literals;
extern char * * environ;
extern char * * environ __attribute__((weak));
/* Recreate the effect of the perl shellwords function, breaking up a
* string into arguments like a shell word, including escapes

2
src/nix/command.cc
View file

@ -4,7 +4,7 @@
#include "nixexpr.hh"
#include "profiles.hh"
extern char * * environ;
extern char * * environ __attribute__((weak));
namespace nix {