aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-01-05 17:41:22 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-01-05 17:41:22 -0700
commit3e39d0c44fbf0cfb56ef0c00fc8ec7c0d5e1c1ec (patch)
tree2ff6f00b6545697c386740032f9a32d124cfb438
parent1a2dd85570a6439f82f7a0dd2cbf452198168c5a (diff)
downloadzig-3e39d0c44fbf0cfb56ef0c00fc8ec7c0d5e1c1ec.tar.gz
zig-3e39d0c44fbf0cfb56ef0c00fc8ec7c0d5e1c1ec.zip
minor fixups from moving identifiers and files around
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/Compilation.zig2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ed25b93d2..ebb4f74ffa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -559,7 +559,7 @@ set(ZIG_STAGE2_SOURCES
"${CMAKE_SOURCE_DIR}/src/link/MachO.zig"
"${CMAKE_SOURCE_DIR}/src/link/MachO/Trie.zig"
"${CMAKE_SOURCE_DIR}/src/link/Wasm.zig"
- "${CMAKE_SOURCE_DIR}/src/link/cbe.h"
+ "${CMAKE_SOURCE_DIR}/src/link/C/zig.h"
"${CMAKE_SOURCE_DIR}/src/link/msdos-stub.bin"
"${CMAKE_SOURCE_DIR}/src/liveness.zig"
"${CMAKE_SOURCE_DIR}/src/llvm_backend.zig"
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 552c550149..bf8fd73e93 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -3123,7 +3123,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
});
break :blk try directory.join(arena, &[_][]const u8{bin_basename});
} else "";
- if (comp.emit_h != null) {
+ if (mod.emit_h != null) {
log.warn("-femit-h is not available in the stage1 backend; no .h file will be produced", .{});
}
const emit_h_path = try stage1LocPath(arena, mod.emit_h, directory);