Commit d3d3ff34 authored by Drew's avatar Drew

Restore bootstrap behavior

parent 284531fc
Pipeline #690 failed with stage
......@@ -10,10 +10,10 @@ commands:
<atllbuild-swiftc>:
tool: swift-compiler
executable: "/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/swiftc"
inputs: ["attools/src/atllbuild.swift","attools/src/Nop.swift","attools/src/PlatformPaths.swift","attools/src/Shell.swift","attools/src/TaskRunner.swift","attools/src/Tools.swift"]
sources: ["attools/src/atllbuild.swift","attools/src/Nop.swift","attools/src/PlatformPaths.swift","attools/src/Shell.swift","attools/src/TaskRunner.swift","attools/src/Tools.swift"]
objects: [".atllbuild/objects/atllbuild.o",".atllbuild/objects/Nop.o",".atllbuild/objects/PlatformPaths.o",".atllbuild/objects/Shell.o",".atllbuild/objects/TaskRunner.o",".atllbuild/objects/Tools.o"]
outputs: ["<atllbuild-swiftc>",".atllbuild/products/attools.a",".atllbuild/objects/atllbuild.o",".atllbuild/objects/Nop.o",".atllbuild/objects/PlatformPaths.o",".atllbuild/objects/Shell.o",".atllbuild/objects/TaskRunner.o",".atllbuild/objects/Tools.o"]
inputs: ["attools/src/atllbuild.swift", "attools/src/Nop.swift", "attools/src/PlatformPaths.swift", "attools/src/Shell.swift", "attools/src/TaskRunner.swift", "attools/src/Tools.swift"]
sources: ["attools/src/atllbuild.swift", "attools/src/Nop.swift", "attools/src/PlatformPaths.swift", "attools/src/Shell.swift", "attools/src/TaskRunner.swift", "attools/src/Tools.swift"]
objects: [".atllbuild/objects/atllbuild.swift.o", ".atllbuild/objects/Nop.swift.o", ".atllbuild/objects/PlatformPaths.swift.o", ".atllbuild/objects/Shell.swift.o", ".atllbuild/objects/TaskRunner.swift.o", ".atllbuild/objects/Tools.swift.o"]
outputs: ["<atllbuild-swiftc>", ".atllbuild/objects/atllbuild.swift.o", ".atllbuild/objects/Nop.swift.o", ".atllbuild/objects/PlatformPaths.swift.o", ".atllbuild/objects/Shell.swift.o", ".atllbuild/objects/TaskRunner.swift.o", ".atllbuild/objects/Tools.swift.o"]
is-library: true
module-name: attools
module-output-path: .atllbuild/products/attools.swiftmodule
......@@ -21,7 +21,7 @@ commands:
other-args: ["-j8", "-D", "ATBUILD", "-I", ".atllbuild/products/", "-sdk", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"]
<atllbuild>:
tool: shell
inputs: ["<atllbuild-swiftc>", ".atllbuild/objects/atllbuild.o",".atllbuild/objects/Nop.o",".atllbuild/objects/PlatformPaths.o",".atllbuild/objects/Shell.o",".atllbuild/objects/TaskRunner.o",".atllbuild/objects/Tools.o"]
inputs: ["<atllbuild-swiftc>", ".atllbuild/objects/atllbuild.swift.o", ".atllbuild/objects/Nop.swift.o", ".atllbuild/objects/PlatformPaths.swift.o", ".atllbuild/objects/Shell.swift.o", ".atllbuild/objects/TaskRunner.swift.o", ".atllbuild/objects/Tools.swift.o"]
outputs: ["<atllbuild>", ".atllbuild/products/attools.a"]
args: ["/bin/sh","-c","rm -rf .atllbuild/products/attools.a; ar cr '.atllbuild/products/attools.a' '.atllbuild/objects/atllbuild.o' '.atllbuild/objects/Nop.o' '.atllbuild/objects/PlatformPaths.o' '.atllbuild/objects/Shell.o' '.atllbuild/objects/TaskRunner.o' '.atllbuild/objects/Tools.o'"]
args: ["/bin/sh","-c",rm -rf .atllbuild/products/attools.a; ar cr '.atllbuild/products/attools.a' '.atllbuild/objects/atllbuild.swift.o' '.atllbuild/objects/Nop.swift.o' '.atllbuild/objects/PlatformPaths.swift.o' '.atllbuild/objects/Shell.swift.o' '.atllbuild/objects/TaskRunner.swift.o' '.atllbuild/objects/Tools.swift.o']
description: "Linking Library: .atllbuild/products/attools.a"
\ No newline at end of file
......@@ -23,5 +23,5 @@ $SWIFT_BUILD_TOOL -f bootstrap/bootstrap-$PLATFORM.swift-build --no-db
if [ "0" = "$?" ]; then
rm -rf bin
mkdir -p bin
ln -s $BUILD_DIR/.atllbuild/products/atbuild bin/atbuild
ln -s ../.atllbuild/products/atbuild bin/atbuild
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment