Skip to content

Commit

Permalink
[TIMOB-26109] [TIMOB-26110] Use legacy build system for now (#10123)
Browse files Browse the repository at this point in the history
* [TIMOB-26109] [TIMOB-26110] Use legacy build system for now

* Update _build.js
  • Loading branch information
hansemannn authored and sgtcoolguy committed Aug 27, 2018
1 parent 7269839 commit 5694af1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions iphone/cli/commands/_build.js
Expand Up @@ -4682,7 +4682,7 @@ iOSBuilder.prototype.cleanXcodeDerivedData = function cleanXcodeDerivedData(next
}

const exe = this.xcodeEnv.executables.xcodebuild,
args = [ 'clean' ];
args = [ 'clean', '-UseNewBuildSystem=NO' ]; // Use old build system until www.openradar.me/40906897 is fixed
let tries = 0,
lastErr = null,
done = false;
Expand Down Expand Up @@ -6533,7 +6533,8 @@ iOSBuilder.prototype.invokeXcodeBuild = function invokeXcodeBuild(next) {
'-derivedDataPath', path.join(this.buildDir, 'DerivedData'),
'OBJROOT=' + path.join(this.buildDir, 'build', 'Intermediates'),
'SHARED_PRECOMPS_DIR=' + path.join(this.buildDir, 'build', 'Intermediates', 'PrecompiledHeaders'),
'SYMROOT=' + path.join(this.buildDir, 'build', 'Products')
'SYMROOT=' + path.join(this.buildDir, 'build', 'Products'),
'-UseNewBuildSystem=NO' // Use old build system until www.openradar.me/40906897 is fixed
];

if (this.simHandle) {
Expand Down
6 changes: 4 additions & 2 deletions iphone/cli/commands/_buildModule.js
Expand Up @@ -455,13 +455,15 @@ iOSModuleBuilder.prototype.buildModule = function buildModule(next) {
// Create a build for the device
xcodebuildHook(this.xcodeEnv.executables.xcodebuild, [
'-configuration', 'Release',
'-sdk', 'iphoneos'
'-sdk', 'iphoneos',
'-UseNewBuildSystem=NO',
], opts, 'xcode-dist', done);

// Create a build for the simulator
xcodebuildHook(this.xcodeEnv.executables.xcodebuild, [
'-configuration', 'Release',
'-sdk', 'iphonesimulator'
'-sdk', 'iphonesimulator',
'-UseNewBuildSystem=NO',
], opts, 'xcode-sim', done);
};

Expand Down

0 comments on commit 5694af1

Please sign in to comment.