Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
A
atbuild
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AnarchyTools
atbuild
Commits
dc20b2ad
Commit
dc20b2ad
authored
Jun 29, 2016
by
Drew
Committed by
GitHub
Jun 29, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #109 from AnarchyTools/swiftc-path
Remove atllbuild option swiftc-path
parents
86a5dffb
3798f21b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
14 deletions
+2
-14
attools/src/atllbuild.swift
attools/src/atllbuild.swift
+2
-12
build.atpkg
build.atpkg
+0
-2
No files found.
attools/src/atllbuild.swift
View file @
dc20b2ad
...
...
@@ -256,7 +256,6 @@ final class ATllbuild : Tool {
case
LinkSDK
=
"link-sdk"
case
LinkWithProduct
=
"link-with-product"
case
LinkWithAtbin
=
"link-with-atbin"
case
SwiftCPath
=
"swiftc-path"
case
XCTestify
=
"xctestify"
case
XCTestStrict
=
"xctest-strict"
case
IncludeWithUser
=
"include-with-user"
...
...
@@ -282,8 +281,7 @@ final class ATllbuild : Tool {
LinkOptions
,
LinkSDK
,
LinkWithProduct
,
LinkWithAtbin
,
SwiftCPath
,
LinkWithAtbin
,
XCTestify
,
XCTestStrict
,
IncludeWithUser
,
...
...
@@ -616,15 +614,7 @@ final class ATllbuild : Tool {
else
{
llbuildyamlpath
=
workDirectory
.
appending
(
"llbuild.yaml"
)
}
let
swiftCPath
:
Path
if
let
c
=
task
[
Options
.
SwiftCPath
.
rawValue
]?
.
string
{
print
(
"Warning:
\(
Options
.
SwiftCPath
.
rawValue
)
is deprecated and will be removed in a future release of atbuild. Use --toolchain to specify a different toolchain, or --platform when bootstrapping to a different platform."
)
sleep
(
5
)
swiftCPath
=
Path
(
c
)
}
else
{
swiftCPath
=
findToolPath
(
toolName
:
"swiftc"
,
toolchain
:
toolchain
)
}
let
swiftCPath
=
findToolPath
(
toolName
:
"swiftc"
,
toolchain
:
toolchain
)
let
enableWMO
:
Bool
if
let
wmo
=
task
[
Options
.
WholeModuleOptimization
.
rawValue
]?
.
bool
{
...
...
build.atpkg
View file @
dc20b2ad
...
...
@@ -35,7 +35,6 @@
}
:bootstrap-linux {
:bootstrap-only true
:swiftc-path "/usr/local/bin/swiftc"
:link-sdk false
:llbuildyaml "bootstrap/bootstrap-linux.swift-build"
}
...
...
@@ -59,7 +58,6 @@
}
:bootstrap-linux {
:bootstrap-only true
:swiftc-path "/usr/local/bin/swiftc"
:link-sdk false
:llbuildyaml "bootstrap/bootstrap-linux-attools.swift-build"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment