Bug 1216575 - [mozbuild] Remove if statement that sets bindir to resource dir on osx, r=spohl
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 21 Oct 2015 10:04:21 -0400
changeset 303948 874761c630c2d02abff6bd179985ce81b9ce64a9
parent 303947 c957a53970002745c631f493a47fa589a4b4c1b1
child 303949 e55d4c56c0ee3bdecef68c73e90ab299a9abbd44
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl
bugs1216575
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1216575 - [mozbuild] Remove if statement that sets bindir to resource dir on osx, r=spohl
python/mozbuild/mozbuild/base.py
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -273,19 +273,16 @@ class MozbuildObject(ProcessExecutionMix
         return self.config_environment.substs
 
     @property
     def distdir(self):
         return os.path.join(self.topobjdir, 'dist')
 
     @property
     def bindir(self):
-        import mozinfo
-        if mozinfo.isMac:
-            return os.path.join(self.topobjdir, 'dist', self.substs['MOZ_MACBUNDLE_NAME'], 'Contents', 'Resources')
         return os.path.join(self.topobjdir, 'dist', 'bin')
 
     @property
     def includedir(self):
         return os.path.join(self.topobjdir, 'dist', 'include')
 
     @property
     def statedir(self):