diff options
| author | Michael Forney <mforney@mforney.org> | 2016-05-16 23:25:30 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-05-16 23:25:30 -0700 |
| commit | ace5dc7bec78220d84100f86a8b707b305af7ca8 (patch) | |
| tree | 58a97c97d5ed877f440130b8a1d344176c801d13 | |
| parent | 45708bec2913469055b483dcba81b17ebeb49708 (diff) | |
Add ninja 1.7.1
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | core/gen.rc | 1 | ||||
| -rw-r--r-- | core/ninja/gen.rc | 31 | ||||
| m--------- | core/ninja/src | 0 | ||||
| -rw-r--r-- | ninja.rc | 2 | ||||
| -rw-r--r-- | toolchain/default.ninja | 2 |
6 files changed, 38 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 1167c4ee..8c4c283a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,6 +31,9 @@ [submodule "core/msmtp/src"] path = core/msmtp/src url = git://git.code.sf.net/p/msmtp/code +[submodule "core/ninja/src"] + path = core/ninja/src + url = https://github.com/ninja-build/ninja [submodule "core/pigz/src"] path = core/pigz/src url = https://github.com/madler/pigz diff --git a/core/gen.rc b/core/gen.rc index c97b9ff3..4de5c16a 100644 --- a/core/gen.rc +++ b/core/gen.rc @@ -11,6 +11,7 @@ subgen libressl subgen loksh subgen mdocml subgen msmtp +subgen ninja subgen openbsd subgen perp subgen pigz diff --git a/core/ninja/gen.rc b/core/ninja/gen.rc new file mode 100644 index 00000000..c29b830b --- /dev/null +++ b/core/ninja/gen.rc @@ -0,0 +1,31 @@ +set cc '$cxx' +set cflags '$cxxflags' \ + -Wall -Wextra -Wno-deprecated -Wno-unused-parameter\ + -fno-rtti -fno-exceptions -fvisibility'='hidden\ + -D USE_PPOLL + +exe ninja src/^(\ + ninja.cc\ + build.cc\ + build_log.cc\ + clean.cc\ + clparser.cc\ + debug_flags.cc\ + depfile_parser.cc\ + deps_log.cc\ + disk_interface.cc\ + edit_distance.cc\ + eval_env.cc\ + graph.cc\ + graphviz.cc\ + lexer.cc\ + line_printer.cc\ + manifest_parser.cc\ + metrics.cc\ + state.cc\ + util.cc\ + version.cc\ + subprocess-posix.cc\ +) + +file bin/ninja '$outdir'/ninja 755 diff --git a/core/ninja/src b/core/ninja/src new file mode 160000 +Subproject b49b0fc01bb052b6ac856b1e72be9391e962398 @@ -99,7 +99,7 @@ fn objects { shift 2 } for(src) { - if(~ $src *.c) { + if(~ $src *.[cS] *.cc *.cpp) { cc $src $deps obj=$src.o } diff --git a/toolchain/default.ninja b/toolchain/default.ninja index 6b79f370..871bda36 100644 --- a/toolchain/default.ninja +++ b/toolchain/default.ninja @@ -1,5 +1,7 @@ ar = ar cc = cc +cxx = c++ cflags = -O2 -march=native -pipe +cxxflags = $cflags ldflags = -static -s |