Index: lib/naclports/source_package.py |
diff --git a/lib/naclports/source_package.py b/lib/naclports/source_package.py |
index ea356276fe6dc21de15ee553b89d5ba41e30cf1d..d0cd87a0931f42495271ed8bb3e6f534bc9383ba 100644 |
--- a/lib/naclports/source_package.py |
+++ b/lib/naclports/source_package.py |
@@ -216,6 +216,8 @@ class SourcePackage(package.Package): |
def InstallDeps(self, force, from_source=False): |
for dep in self.Dependencies(): |
+ if self.TOOLCHAIN_INSTALL == '0': |
+ continue |
if not dep.IsAnyVersionInstalled() or force == 'all': |
dep.Install(True, force, from_source) |
@@ -291,9 +293,7 @@ class SourcePackage(package.Package): |
def CreatePkgFile(self): |
"""Create and pkg file for use with the FreeBSD pkg tool. |
- This step is designed to run after the build scripts and will |
- package up any files published by the PublishByArchForDevEnv |
- step. |
+ Create a package from the result of the package's InstallStep. |
""" |
install_dir = self.GetInstallLocation() |
if not os.path.exists(install_dir): |
@@ -305,9 +305,7 @@ class SourcePackage(package.Package): |
abi_dir = os.path.join(paths.PUBLISH_ROOT, abi) |
pkg_file = os.path.join(abi_dir, '%s-%s.tbz' % (self.NAME, |
self.VERSION)) |
- |
util.Makedirs(abi_dir) |
- |
deps = self.DEPENDS |
if self.config.toolchain != 'glibc': |
deps = [] |