Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
fe106832
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fe106832
编写于
3月 04, 2018
作者:
M
Matt Witherspoon
提交者:
GitHub
3月 04, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1534 from EOSIO/fix_eosiocpp_again
fix eosiocpp so external contracts can be built
上级
a66d0d42
3096d2c3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
23 deletion
+22
-23
CMakeModules/wasm.cmake
CMakeModules/wasm.cmake
+2
-0
tools/eosiocpp.in
tools/eosiocpp.in
+20
-23
未找到文件。
CMakeModules/wasm.cmake
浏览文件 @
fe106832
...
@@ -111,6 +111,8 @@ macro(add_wast_library)
...
@@ -111,6 +111,8 @@ macro(add_wast_library)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
VERBATIM
VERBATIM
)
)
#TODO: Fix this path on pending cmake install changes
install
(
FILES
${${
ARG_TARGET
}
_BC_FILENAME
}
DESTINATION usr/share/eosio/contractsdk/lib
)
endmacro
(
add_wast_library
)
endmacro
(
add_wast_library
)
...
...
tools/eosiocpp.in
浏览文件 @
fe106832
...
@@ -27,36 +27,33 @@ function build_contract {
...
@@ -27,36 +27,33 @@ function build_contract {
# echo mkdir $workdir/built
# echo mkdir $workdir/built
mkdir
$workdir
/built
mkdir
$workdir
/built
if
[[
${
VERBOSE
}
==
"1"
]]
;
then
PRINT_CMDS
=
"set -x"
fi
for
file
in
$@
;
do
for
file
in
$@
;
do
name
=
`
basename
$file
`
name
=
`
basename
$file
`
filePath
=
`
dirname
$file
`
filePath
=
`
dirname
$file
`
# echo @WASM_CLANG@ -emit-llvm -O3 --std=c++14 --target=wasm32 -nostdinc \
(
$PRINT_CMDS
;
@WASM_CLANG@
-emit-llvm
-O3
--std
=
c++14
--target
=
wasm32
-nostdinc
\
# -nostdlib -nostdlibinc -ffreestanding -nostdlib -fno-threadsafe-statics -fno-rtti \
-nostdlib
-nostdlibinc
-ffreestanding
-nostdlib
-fno-threadsafe-statics
-fno-rtti
\
# -fno-exceptions -I ${EOSIO_INSTALL_DIR}/include \
-fno-exceptions
-I
${
EOSIO_INSTALL_DIR
}
/include
\
# -I${EOSIO_INSTALL_DIR}/include/libc++/upstream/include \
-I
${
EOSIO_INSTALL_DIR
}
/include/libc++/upstream/include
\
# -I${EOSIO_INSTALL_DIR}/include/musl/upstream/include \
-I
${
EOSIO_INSTALL_DIR
}
/include/musl/upstream/include
\
# -I${BOOST_INCLUDE_DIR} \
-I
${
BOOST_INCLUDE_DIR
}
\
# -I $filePath \
-I
$filePath
\
# -c $file -o $workdir/built/$name
-c
$file
-o
$workdir
/built/
$name
)
@WASM_CLANG@
-emit-llvm
-O3
--std
=
c++14
--target
=
wasm32
-nostdinc
\
-nostdlib
-nostdlibinc
-ffreestanding
-nostdlib
-fno-threadsafe-statics
-fno-rtti
\
-fno-exceptions
-I
${
EOSIO_INSTALL_DIR
}
/include
\
-I
${
EOSIO_INSTALL_DIR
}
/include/libc++/upstream/include
\
-I
${
EOSIO_INSTALL_DIR
}
/include/musl/upstream/include
\
-I
${
BOOST_INCLUDE_DIR
}
\
-I
$filePath
\
-c
$file
-o
$workdir
/built/
$name
done
done
# echo @WASM_LLVM_LINK@ -o $workdir/linked.bc $workdir/built/*
(
$PRINT_CMDS
;
@WASM_LLVM_LINK@
-only-needed
-o
$workdir
/linked.bc
$workdir
/built/
*
\
@WASM_LLVM_LINK@
-o
$workdir
/linked.bc
$workdir
/built/
*
${
EOSIO_INSTALL_DIR
}
/usr/share/eosio/contractsdk/lib/libc.bc
\
# echo @WASM_LLC@ --asm-verbose=false -o $workdir/assembly.s $workdir/linked.bc
${
EOSIO_INSTALL_DIR
}
/usr/share/eosio/contractsdk/lib/libc++.bc
\
@WASM_LLC@
--asm-verbose
=
false
-o
$workdir
/assembly.s
$workdir
/linked.bc
${
EOSIO_INSTALL_DIR
}
/usr/share/eosio/contractsdk/lib/eosiolib.bc
# echo ${EOSIO_INSTALL_DIR}/bin/eosio-s2wasm -o $outname -s 16384 $workdir/assembly.s
)
${
EOSIO_INSTALL_DIR
}
/bin/eosio-s2wasm
-o
$outname
-s
16384
$workdir
/assembly.s
(
$PRINT_CMDS
;
@WASM_LLC@
-thread-model
=
single
--asm-verbose
=
false
-o
$workdir
/assembly.s
$workdir
/linked.bc
)
(
$PRINT_CMDS
;
${
EOSIO_INSTALL_DIR
}
/bin/eosio-s2wasm
-o
$outname
-s
16384
$workdir
/assembly.s
)
# echo rm -rf $workdir
# echo rm -rf $workdir
rm
-rf
$workdir
rm
-rf
$workdir
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录