--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -717,16 +717,74 @@ set_define('XP_LINUX', target_is_linux)
 
 @depends(target)
 def target_is_solaris(target):
     if target.kernel == 'SunOS':
         return True
 
 set_define('XP_SOLARIS', target_is_solaris)
 
+# Filesystem feature support
+# ===================================
+
+@template
+def check_links(sym_or_hard, desc, source=None):
+    func_name = {
+        'symbolic': 'symlink',
+        'hard': 'link',
+    }[sym_or_hard]
+
+    source_name = source
+
+    @depends(check_build_environment)
+    @checking('for %s link support %s' % (sym_or_hard, desc))
+    @imports(_from='__builtin__', _import='OSError')
+    @imports(_from='__builtin__', _import='open')
+    @imports('errno')
+    @imports('os')
+    def check(build_env):
+        func = getattr(os, func_name, None)
+        if not func:
+            return None
+
+        if source_name:
+            source = os.path.join(build_env.topsrcdir, source_name)
+        else:
+            source = os.path.join(build_env.topobjdir, '%s.source' % sym_or_hard)
+            with open(source, 'a'):
+                pass
+
+        dest = os.path.join(build_env.topobjdir, '%s.test' % sym_or_hard)
+
+        try:
+            os.remove(dest)
+        except OSError as e:
+            if e.errno != errno.ENOENT:
+                raise
+
+        try:
+            func(source, dest)
+        except OSError:
+            return None
+
+        os.remove(dest)
+
+        return True
+
+    return check
+
+topobjdir_symlinks = check_links('symbolic', 'from topsrcdir to topobjdir',
+                                 'mach')
+set_config('TOPOBJDIR_TOPSRCDIR_SYMLINKS', topobjdir_symlinks)
+topobjdir_hardlinks = check_links('hard', 'from topsrcdir to topobjdir',
+                                  'mach')
+set_config('TOPOBJDIR_TOPSRCDIR_HARDLINKS', topobjdir_hardlinks)
+set_config('TOPOBJDIR_INTRA_HARDLINKS',
+           check_links('hard', 'within topobjdir'))
+
 # The application/project to build
 # ==============================================================
 option('--enable-application', nargs=1, env='MOZ_BUILD_APP',
        help='Application to build. Same as --enable-project.')
 
 @depends('--enable-application', '--help')
 def application(app, help):
     if app: