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

appended ' __attribute__((weak)); ' to 'extern char * * environ '
NixOS · Jun 17, 2020 · ea5bcfb · ea5bcfb
2 parents 9ce994d + e9970a3
commit ea5bcfb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
@@ -35,7 +35,7 @@
 #endif
 
 
-extern char * * environ;
+extern char * * environ __attribute__((weak));
 
 
 namespace nix {

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
@@ -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

diff --git a/src/nix/command.cc b/src/nix/command.cc
@@ -4,7 +4,7 @@
 #include "nixexpr.hh"
 #include "profiles.hh"
 
-extern char * * environ;
+extern char * * environ __attribute__((weak));
 
 namespace nix {