authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-01-04 23:43:46-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-01-04 23:43:46-05:00
log79d50d993361322720a96f9b06f6f77733cea822
tree41b22a045a8c521494d36b34a339b119f1bf960a
parentf377b1e88609ff461bd5ad84b3fd915039b1ede8

appveyor: enable verbose link for self hosted compiler

4 files changed, 10 insertions(+), 11 deletions(-)

build.zig+2
...@@ -90,6 +90,8 @@ pub fn build(b: &Builder) {...@@ -90,6 +90,8 @@ pub fn build(b: &Builder) {
90 if (!skip_self_hosted) {90 if (!skip_self_hosted) {
91 test_step.dependOn(&exe.step);91 test_step.dependOn(&exe.step);
92 }92 }
93 const verbose_link_exe = b.option(bool, "verbose-link", "Print link command for self hosted compiler") ?? false;
94 exe.setVerboseLink(verbose_link_exe);
9395
94 b.installArtifact(exe);96 b.installArtifact(exe);
95 installStdLib(b, std_files);97 installStdLib(b, std_files);
ci/appveyor/build_script.bat+1-1
...@@ -23,7 +23,7 @@ cd %ZIGBUILDDIR%...@@ -23,7 +23,7 @@ cd %ZIGBUILDDIR%
23cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release "-DZIG_LIBC_INCLUDE_DIR=C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt" "-DZIG_LIBC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\bin\x64\ucrt" "-DZIG_LIBC_STATIC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64" || exit /b23cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release "-DZIG_LIBC_INCLUDE_DIR=C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt" "-DZIG_LIBC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\bin\x64\ucrt" "-DZIG_LIBC_STATIC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64" || exit /b
24msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b24msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b
2525
26bin\zig.exe build --build-file ..\build.zig test -Dskip-self-hosted || exit /b26bin\zig.exe build --build-file ..\build.zig test -Dverbose-link || exit /b
2727
28@echo "MSVC build succeeded, proceeding with MinGW build"28@echo "MSVC build succeeded, proceeding with MinGW build"
29cd %APPVEYOR_BUILD_FOLDER%29cd %APPVEYOR_BUILD_FOLDER%
std/build.zig+6-9
...@@ -842,10 +842,10 @@ pub const LibExeObjStep = struct {...@@ -842,10 +842,10 @@ pub const LibExeObjStep = struct {
842 lib_paths: ArrayList([]const u8),842 lib_paths: ArrayList([]const u8),
843 disable_libc: bool,843 disable_libc: bool,
844 frameworks: BufSet,844 frameworks: BufSet,
845 verbose_link: bool,
845846
846 // zig only stuff847 // zig only stuff
847 root_src: ?[]const u8,848 root_src: ?[]const u8,
848 verbose: bool,
849 output_h_path: ?[]const u8,849 output_h_path: ?[]const u8,
850 out_h_filename: []const u8,850 out_h_filename: []const u8,
851 assembly_files: ArrayList([]const u8),851 assembly_files: ArrayList([]const u8),
...@@ -923,7 +923,7 @@ pub const LibExeObjStep = struct {...@@ -923,7 +923,7 @@ pub const LibExeObjStep = struct {
923 var self = LibExeObjStep {923 var self = LibExeObjStep {
924 .strip = false,924 .strip = false,
925 .builder = builder,925 .builder = builder,
926 .verbose = false,926 .verbose_link = false,
927 .build_mode = builtin.Mode.Debug,927 .build_mode = builtin.Mode.Debug,
928 .static = static,928 .static = static,
929 .kind = kind,929 .kind = kind,
...@@ -988,7 +988,7 @@ pub const LibExeObjStep = struct {...@@ -988,7 +988,7 @@ pub const LibExeObjStep = struct {
988 .linker_script = null,988 .linker_script = null,
989989
990 .root_src = undefined,990 .root_src = undefined,
991 .verbose = undefined,991 .verbose_link = false,
992 .output_h_path = undefined,992 .output_h_path = undefined,
993 .out_h_filename = undefined,993 .out_h_filename = undefined,
994 .assembly_files = undefined,994 .assembly_files = undefined,
...@@ -1087,8 +1087,8 @@ pub const LibExeObjStep = struct {...@@ -1087,8 +1087,8 @@ pub const LibExeObjStep = struct {
1087 %%self.source_files.append(file);1087 %%self.source_files.append(file);
1088 }1088 }
10891089
1090 pub fn setVerbose(self: &LibExeObjStep, value: bool) {1090 pub fn setVerboseLink(self: &LibExeObjStep, value: bool) {
1091 self.verbose = value;1091 self.verbose_link = value;
1092 }1092 }
10931093
1094 pub fn setBuildMode(self: &LibExeObjStep, mode: builtin.Mode) {1094 pub fn setBuildMode(self: &LibExeObjStep, mode: builtin.Mode) {
...@@ -1223,15 +1223,12 @@ pub const LibExeObjStep = struct {...@@ -1223,15 +1223,12 @@ pub const LibExeObjStep = struct {
1223 %%zig_args.append(builder.pathFromRoot(asm_file));1223 %%zig_args.append(builder.pathFromRoot(asm_file));
1224 }1224 }
12251225
1226 if (self.verbose) {
1227 %%zig_args.append("--verbose");
1228 }
1229 if (builder.verbose_tokenize) %%zig_args.append("--verbose-tokenize");1226 if (builder.verbose_tokenize) %%zig_args.append("--verbose-tokenize");
1230 if (builder.verbose_ast) %%zig_args.append("--verbose-ast");1227 if (builder.verbose_ast) %%zig_args.append("--verbose-ast");
1231 if (builder.verbose_cimport) %%zig_args.append("--verbose-cimport");1228 if (builder.verbose_cimport) %%zig_args.append("--verbose-cimport");
1232 if (builder.verbose_ir) %%zig_args.append("--verbose-ir");1229 if (builder.verbose_ir) %%zig_args.append("--verbose-ir");
1233 if (builder.verbose_llvm_ir) %%zig_args.append("--verbose-llvm-ir");1230 if (builder.verbose_llvm_ir) %%zig_args.append("--verbose-llvm-ir");
1234 if (builder.verbose_link) %%zig_args.append("--verbose-link");1231 if (builder.verbose_link or self.verbose_link) %%zig_args.append("--verbose-link");
12351232
1236 if (self.strip) {1233 if (self.strip) {
1237 %%zig_args.append("--strip");1234 %%zig_args.append("--strip");
std/special/build_runner.zig+1-1
...@@ -14,7 +14,7 @@ pub fn main() -> %void {...@@ -14,7 +14,7 @@ pub fn main() -> %void {
14 var arg_it = os.args();14 var arg_it = os.args();
1515
16 // TODO use a more general purpose allocator here16 // TODO use a more general purpose allocator here
17 var inc_allocator = %%std.heap.IncrementingAllocator.init(30 * 1024 * 1024);17 var inc_allocator = %%std.heap.IncrementingAllocator.init(40 * 1024 * 1024);
18 defer inc_allocator.deinit();18 defer inc_allocator.deinit();
1919
20 const allocator = &inc_allocator.allocator;20 const allocator = &inc_allocator.allocator;