diff options
| author | ruki <[email protected]> | 2017-03-27 15:25:18 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-03-27 15:25:18 +0800 |
| commit | f9ff6e5e50c26501964a3b35279aa4881d3865a3 (patch) | |
| tree | e66772a49e71ff7c0390dbe10ef9a4e779cae223 | |
| parent | 3bbd679fd2edbda30369d74a02949fd193a93211 (diff) | |
fix self-build for macosx
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 5 | ||||
| -rw-r--r-- | xmake/actions/install/main.lua | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 493d0c8b9..3c89a3c8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## Bugs fixed * Fix error tips for checking xmake min version +* [#60](https://github.com/tboox/xmake/issues/60): Fix self-build for macosx ## v2.1.2 @@ -229,6 +230,7 @@ ### Bugs修复 * 修复版本检测的错误提示信息 +* [#60](https://github.com/tboox/xmake/issues/60): 修复macosx平台的xmake自举编译 ## v2.1.2 diff --git a/core/xmake.lua b/core/xmake.lua index d95f8dc64..a3ea15547 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -40,6 +40,11 @@ if is_plat("windows") then add_ldflags("-nodefaultlib:\"msvcrt.lib\"") end +-- for macosx +if is_plat("macosx") then + add_ldflags("-all_load", "-pagezero_size 10000", "-image_base 100000000") +end + -- add package directories add_packagedirs("pkg") diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua index 2999daa12..be09c75ff 100644 --- a/xmake/actions/install/main.lua +++ b/xmake/actions/install/main.lua @@ -73,7 +73,7 @@ function main() cprint("${bright yellow}note: ${default yellow}try continue to install with administrator permission again?") cprint("please input: y (y/n)") - -- TODO read + -- TODO fix read api -- get answer io.flush() if io._read() == 'y' then |