Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
d95de0dd
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d95de0dd
编写于
1月 12, 2012
作者:
B
Brian Anderson
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'brson/win32'
上级
fefdb63c
17d504e0
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
46 addition
and
19 deletion
+46
-19
Makefile.in
Makefile.in
+3
-2
configure
configure
+12
-3
mk/platform.mk
mk/platform.mk
+5
-5
src/comp/back/rpath.rs
src/comp/back/rpath.rs
+0
-1
src/comp/util/filesearch.rs
src/comp/util/filesearch.rs
+14
-3
src/etc/snapshot.py
src/etc/snapshot.py
+5
-5
src/snapshots.txt
src/snapshots.txt
+7
-0
未找到文件。
Makefile.in
浏览文件 @
d95de0dd
...
...
@@ -262,6 +262,7 @@ export CFG_HOST_TRIPLE
export
CFG_LLVM_ROOT
export
CFG_ENABLE_MINGW_CROSS
export
CFG_PREFIX
export
CFG_LIBDIR
######################################################################
# Subprograms
...
...
@@ -279,12 +280,12 @@ define SREQ
# Destinations of artifacts for the host compiler
HROOT$(1)_H_$(3)
=
$(3)
/stage
$(1)
HBIN$(1)_H_$(3)
=
$$
(
HROOT
$(1)
_H_
$(3)
)
/bin
HLIB$(1)_H_$(3)
=
$$
(
HROOT
$(1)
_H_
$(3)
)
/
lib
HLIB$(1)_H_$(3)
=
$$
(
HROOT
$(1)
_H_
$(3)
)
/
$
$(CFG_LIBDIR)
# Destinations of artifacts for target architectures
TROOT$(1)_T_$(2)_H_$(3)
=
$$
(
HLIB
$(1)
_H_
$(3)
)
/rustc/
$(2)
TBIN$(1)_T_$(2)_H_$(3)
=
$$
(
TROOT
$(1)
_T_
$(2)
_H_
$(3)
)
/bin
TLIB$(1)_T_$(2)_H_$(3)
=
$$
(
TROOT
$(1)
_T_
$(2)
_H_
$(3)
)
/
lib
TLIB$(1)_T_$(2)_H_$(3)
=
$$
(
TROOT
$(1)
_T_
$(2)
_H_
$(3)
)
/
$
$(CFG_LIBDIR)
# The name of the core and standard libraries used by rustc
ifdef
CFG_DISABLE_SHAREDSTD
...
...
configure
浏览文件 @
d95de0dd
...
...
@@ -397,6 +397,14 @@ do
done
done
# On windows we just store the libraries in the bin directory because
# there's no rpath
CFG_LIBDIR
=
lib
if
[
"
$CFG_OSTYPE
"
=
"pc-mingw32"
]
then
CFG_LIBDIR
=
bin
fi
for
h
in
$CFG_TARGET_TRIPLES
do
for
t
in
$CFG_TARGET_TRIPLES
...
...
@@ -407,13 +415,13 @@ do
make_dir
$h
/stage
$i
/bin
# host lib dir
make_dir
$h
/stage
$i
/
lib
make_dir
$h
/stage
$i
/
$CFG_LIBDIR
# target bin dir
make_dir
$h
/stage
$i
/
lib
/rustc/
$t
/bin
make_dir
$h
/stage
$i
/
$CFG_LIBDIR
/rustc/
$t
/bin
# target lib dir
make_dir
$h
/stage
$i
/
lib/rustc/
$t
/lib
make_dir
$h
/stage
$i
/
$CFG_LIBDIR
/rustc/
$t
/
$CFG_LIBDIR
done
done
...
...
@@ -582,6 +590,7 @@ putvar CFG_HOST_TRIPLE
putvar CFG_TARGET_TRIPLES
putvar CFG_C_COMPILER
putvar CFG_PREFIX
putvar CFG_LIBDIR
# Setting this again because it may have been changed
if
[
$CFG_DISABLE_MANAGE_SUBMODULES
]
...
...
mk/platform.mk
浏览文件 @
d95de0dd
...
...
@@ -108,14 +108,14 @@ endif
CFG_TESTLIB
=
$(CFG_BUILD_DIR)
/
$(2)
/
$(
strip
\
$(
if
$(
findstring
stage0,
$(1)
)
,
\
stage0/
lib
,
\
stage0/
$(CFG_LIBDIR)
,
\
$(
if
$(
findstring
stage1,
$(1)
)
,
\
stage1/
lib
,
\
stage1/
$(CFG_LIBDIR)
,
\
$(
if
$(
findstring
stage2,
$(1)
)
,
\
stage2/
lib
,
\
stage2/
$(CFG_LIBDIR)
,
\
$(
if
$(
findstring
stage3,
$(1)
)
,
\
stage3/
lib
,
\
)))))
/rustc/
$(CFG_HOST_TRIPLE)
/
lib
stage3/
$(CFG_LIBDIR)
,
\
)))))
/rustc/
$(CFG_HOST_TRIPLE)
/
$(CFG_LIBDIR)
ifdef
CFG_UNIXY
CFG_INFO
:=
$
(
info cfg: unix-y environment
)
...
...
src/comp/back/rpath.rs
浏览文件 @
d95de0dd
...
...
@@ -191,7 +191,6 @@ fn minimize_rpaths(rpaths: [str]) -> [str] {
#[cfg(target_os
=
"linux"
)]
#[cfg(target_os
=
"macos"
)]
#[cfg(target_os
=
"freebsd"
)]
#[cfg(test)]
mod
test
{
#[test]
fn
test_rpaths_to_flags
()
{
...
...
src/comp/util/filesearch.rs
浏览文件 @
d95de0dd
...
...
@@ -16,6 +16,7 @@
export
search
;
export
relative_target_lib_path
;
export
get_cargo_root
;
export
libdir
;
type
pick
<
T
>
=
block
(
path
:
fs
::
path
)
->
option
::
t
<
T
>
;
...
...
@@ -80,7 +81,7 @@ fn search<T: copy>(filesearch: filesearch, pick: pick<T>) -> option::t<T> {
}
fn
relative_target_lib_path
(
target_triple
:
str
)
->
[
fs
::
path
]
{
[
"lib"
,
"rustc"
,
target_triple
,
"lib"
]
[
libdir
(),
"rustc"
,
target_triple
,
libdir
()
]
}
fn
make_target_lib_path
(
sysroot
:
fs
::
path
,
...
...
@@ -121,6 +122,16 @@ fn get_cargo_root() -> result::t<fs::path, str> {
fn
get_cargo_lib_path
()
->
result
::
t
<
fs
::
path
,
str
>
{
result
::
chain
(
get_cargo_root
())
{
|
p
|
result
::
ok
(
fs
::
connect
(
p
,
"lib"
))
result
::
ok
(
fs
::
connect
(
p
,
libdir
()
))
}
}
\ No newline at end of file
}
// The name of the directory rustc expects libraries to be located.
// On Unix should be "lib", on windows "bin"
fn
libdir
()
->
str
{
let
libdir
=
#
env
(
"CFG_LIBDIR"
);
if
str
::
is_empty
(
libdir
)
{
fail
"rustc compiled without CFG_LIBDIR environment variable"
;
}
libdir
}
src/etc/snapshot.py
浏览文件 @
d95de0dd
...
...
@@ -29,11 +29,11 @@ snapshot_files = {
"lib/librustrt.dylib"
,
"lib/librustllvm.dylib"
],
"winnt"
:
[
"bin/rustc.exe"
,
"
lib
/core-*.dll"
,
"
lib
/std-*.dll"
,
"
lib
/rustc-*.dll"
,
"
lib
/rustrt.dll"
,
"
lib
/rustllvm.dll"
],
"
bin
/core-*.dll"
,
"
bin
/std-*.dll"
,
"
bin
/rustc-*.dll"
,
"
bin
/rustrt.dll"
,
"
bin
/rustllvm.dll"
],
"freebsd"
:
[
"bin/rustc"
,
"lib/libcore-*.so"
,
"lib/libstd-*.so"
,
...
...
src/snapshots.txt
浏览文件 @
d95de0dd
S 2012-01-12 23e0d16
winnt-i386 3d21b0cddbfd086afaf6632b2458d8457422ff62
linux-i386 bb6b05e0e91ae51d696ebce299a45f89babccdee
macos-i386 9e835b370db42b480eafab4f8365028f1c5a5197
linux-x86_64 e9372901737124fe6b776101f0877cc13c86252f
macos-x86_64 550d9a1b0fb30e5fc296a833682db15088a6c803
S 2012-01-12 44352df
winnt-i386 fcb87845b0c80b1fa8b798d319a1bd4aaeaa91d1
linux-x86_64 dc84514290cafab43d0e79387931d6c79129b5ac
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录