1 files changed, 7 insertions, 2 deletions
diff --git a/wscript b/wscript
index 52d0ea4f44..1fa0d8f543 100755
--- a/wscript
+++ b/wscript
@@ -124,8 +124,13 @@ def configure(conf):
     # strict as the strictest OS we support, so adding this here
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
-    if sys.platform != "openbsd4":
-        conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+
+    # However, until the source3 waf build settles down, this needs to
+    # be disabled, as the bugs mentioned above are hitting too many of
+    # our users
+
+    #if sys.platform != "openbsd4":
+    #    conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)