Push force-cpp11 down to dependencies on osx-64; it's required for the disk stuff so we might as well use it everywhere.

1 files changed, 7 insertions, 2 deletions

diff --git a/cscript b/cscript
index aa2a46b41..510fc44d8 100644
--- a/cscript
+++ b/cscript
@@ -362,8 +362,13 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', None, {'force-cpp11': True}))
-    deps.append(('libsub', None, {'force-cpp11': True}))
+    cpp_lib_options = {}
+    if target.platform == 'osx' and target.bits == 64:
+        # We can use C++11 mode, so let's do it.
+        options['force-cpp11'] = True
+
+    deps.append(('libdcp', None, cpp_lib_options))
+    deps.append(('libsub', None, cpp_lib_options))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.