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

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
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -35,7 +35,7 @@
#endif
extern char * * environ;
extern char * * environ __attribute__((weak));
namespace nix {
+1 -1
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
+1 -1
View File
@@ -4,7 +4,7 @@
#include "nixexpr.hh"
#include "profiles.hh"
extern char * * environ;
extern char * * environ __attribute__((weak));
namespace nix {