about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-20T23·23+0100
committerVincent Ambo <tazjin@google.com>2020-05-20T23·24+0100
commita3b48e65624bc7f4c6dac8022676ae6fcb3be4ea (patch)
treecde1d412276e6209dd7c2c00ecc7454fdc82bf41 /third_party
parent9dfdf16a8d5ff3107c4163ac585ec9be3a2abddb (diff)
chore(3p/nix): Minor fixes to get rid of warnings r/791
Diffstat (limited to 'third_party')
-rw-r--r--third_party/nix/src/libutil/args.hh6
-rw-r--r--third_party/nix/src/libutil/util.cc2
-rw-r--r--third_party/nix/src/nix-build/nix-build.cc2
3 files changed, 3 insertions, 7 deletions
diff --git a/third_party/nix/src/libutil/args.hh b/third_party/nix/src/libutil/args.hh
index ba6582abe424..63637533359b 100644
--- a/third_party/nix/src/libutil/args.hh
+++ b/third_party/nix/src/libutil/args.hh
@@ -8,7 +8,7 @@
 
 namespace nix {
 
-MakeError(UsageError, Error);
+MakeError(UsageError, Error)
 
 enum HashType : char;
 
@@ -118,14 +118,14 @@ class Args {
       flag->arity = 1;
       flag->handler = [=](std::vector<std::string> ss) { *dest = ss[0]; };
       return *this;
-    };
+    }
 
     template <class T>
     FlagMaker& set(T* dest, const T& val) {
       flag->arity = 0;
       flag->handler = [=](std::vector<std::string> ss) { *dest = val; };
       return *this;
-    };
+    }
 
     FlagMaker& mkHashTypeFlag(HashType* ht);
   };
diff --git a/third_party/nix/src/libutil/util.cc b/third_party/nix/src/libutil/util.cc
index b13dd7e4f975..0ad2c51148c9 100644
--- a/third_party/nix/src/libutil/util.cc
+++ b/third_party/nix/src/libutil/util.cc
@@ -35,8 +35,6 @@
 #include <sys/prctl.h>
 #endif
 
-__attribute__((weak));
-
 namespace nix {
 
 const std::string nativeSystem = SYSTEM;
diff --git a/third_party/nix/src/nix-build/nix-build.cc b/third_party/nix/src/nix-build/nix-build.cc
index 921fc2ba22d1..66947051ba32 100644
--- a/third_party/nix/src/nix-build/nix-build.cc
+++ b/third_party/nix/src/nix-build/nix-build.cc
@@ -23,8 +23,6 @@
 using namespace nix;
 using namespace std::string_literals;
 
-__attribute__((weak));
-
 /* Recreate the effect of the perl shellwords function, breaking up a
  * string into arguments like a shell word, including escapes
  */