about summary refs log tree commit diff
path: root/third_party/nix/src/libmain
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-23T23·48+0100
committerVincent Ambo <tazjin@google.com>2020-05-24T01·13+0100
commit10481d25861f1c25b53cfbd8119199ef2e918f9f (patch)
treee89d668351fa12faa7b1508c2a7a68582d48bf22 /third_party/nix/src/libmain
parentbac38f3c49db6d9a85ba447d164d35811dfdc8f9 (diff)
chore(3p/nix): Remove some OS X specific defines r/834
This project will be dropping OS X support until the core is simplified.
Diffstat (limited to 'third_party/nix/src/libmain')
-rw-r--r--third_party/nix/src/libmain/shared.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc
index f6c80cae30ef..d2b2a2800c46 100644
--- a/third_party/nix/src/libmain/shared.cc
+++ b/third_party/nix/src/libmain/shared.cc
@@ -142,17 +142,6 @@ void initNix() {
     throw SysError("handling SIGUSR1");
   }
 
-#if __APPLE__
-  /* HACK: on darwin, we need can’t use sigprocmask with SIGWINCH.
-   * Instead, add a dummy sigaction handler, and signalHandlerThread
-   * can handle the rest. */
-  struct sigaction sa;
-  sa.sa_handler = sigHandler;
-  if (sigaction(SIGWINCH, &sa, 0)) {
-    throw SysError("handling SIGWINCH");
-  }
-#endif
-
   /* Register a SIGSEGV handler to detect stack overflows. */
   detectStackOverflow();
 
@@ -165,14 +154,6 @@ void initNix() {
   struct timeval tv;
   gettimeofday(&tv, nullptr);
   srandom(tv.tv_usec);
-
-  /* On macOS, don't use the per-session TMPDIR (as set e.g. by
-     sshd). This breaks build users because they don't have access
-     to the TMPDIR, in particular in ‘nix-store --serve’. */
-#if __APPLE__
-  if (getuid() == 0 && hasPrefix(getEnv("TMPDIR"), "/var/folders/"))
-    unsetenv("TMPDIR");
-#endif
 }
 
 LegacyArgs::LegacyArgs(