@@ -81,6 +81,11 @@ pub fn new_workcache_context(p: &Path) -> workcache::Context {
81
81
82
82
pub fn build_lib ( sysroot : Path , root : Path , name : ~str , version : Version ,
83
83
lib : Path ) {
84
+ build_lib_with_cfgs ( sysroot, root, name, version, lib, ~[ ] )
85
+ }
86
+
87
+ pub fn build_lib_with_cfgs ( sysroot : Path , root : Path , name : ~str ,
88
+ version : Version , lib : Path , cfgs : ~[ ~str ] ) {
84
89
let cx = default_context ( sysroot, root. clone ( ) ) ;
85
90
let pkg_src = PkgSrc {
86
91
source_workspace : root. clone ( ) ,
@@ -94,11 +99,16 @@ pub fn build_lib(sysroot: Path, root: Path, name: ~str, version: Version,
94
99
tests : ~[ ] ,
95
100
benchs : ~[ ]
96
101
} ;
97
- pkg_src. build ( & cx, ~ [ ] , [ ] ) ;
102
+ pkg_src. build ( & cx, cfgs , [ ] ) ;
98
103
}
99
104
100
105
pub fn build_exe ( sysroot : Path , root : Path , name : ~str , version : Version ,
101
106
main : Path ) {
107
+ build_exe_with_cfgs ( sysroot, root, name, version, main, ~[ ] )
108
+ }
109
+
110
+ pub fn build_exe_with_cfgs ( sysroot : Path , root : Path , name : ~str ,
111
+ version : Version , main : Path , cfgs : ~[ ~str ] ) {
102
112
let cx = default_context ( sysroot, root. clone ( ) ) ;
103
113
let pkg_src = PkgSrc {
104
114
source_workspace : root. clone ( ) ,
@@ -113,7 +123,7 @@ pub fn build_exe(sysroot: Path, root: Path, name: ~str, version: Version,
113
123
benchs : ~[ ]
114
124
} ;
115
125
116
- pkg_src. build ( & cx, ~ [ ] , [ ] ) ;
126
+ pkg_src. build ( & cx, cfgs , [ ] ) ;
117
127
}
118
128
119
129
pub fn install_pkg ( cx : & BuildContext ,
5 commit comments
bors commentedon Nov 17, 2013
saw approval from cmr
at https://github.com/z0w0/rust/commit/57486994d56e57044a37144fa6f741a946ff295a
bors commentedon Nov 17, 2013
merging z0w0/rust/issue-9944 = 5748699 into auto
bors commentedon Nov 17, 2013
z0w0/rust/issue-9944 = 5748699 merged ok, testing candidate = 0a577f3
bors commentedon Nov 17, 2013
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2487
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/333
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/333
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2491
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1597
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1596
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2503
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1595
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1595
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2504
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1595
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1595
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/1671
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2491
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1595
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1597
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2267
bors commentedon Nov 17, 2013
fast-forwarding master to auto = 0a577f3