diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb07c687c..2d37b7474 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,9 +53,9 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 cd resources/testproject ..\..\build\${{ matrix.build_type }}\c3c.exe -vvv --emit-llvm run hello_world_win32 --trust=full - dir build\llvm\windows-x64 + dir out\llvm\windows-x64 ..\..\build\${{ matrix.build_type }}\c3c.exe clean - dir build\llvm\windows-x64 + dir out\llvm\windows-x64 - name: Build testproject lib diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c index f2caa0b2a..19a42c20f 100644 --- a/src/compiler/compiler.c +++ b/src/compiler/compiler.c @@ -479,20 +479,15 @@ void compiler_compile(void) void **gen_contexts; void (*task)(void *); - - if (compiler.build.asm_file_dir || compiler.build.ir_file_dir || compiler.build.emit_object_files) - { - create_output_dir(compiler.build.build_dir); - } - if (compiler.build.ir_file_dir && (compiler.build.emit_llvm || compiler.build.test_output || compiler.build.lsp_output)) + if ((compiler.build.emit_llvm || compiler.build.test_output || compiler.build.lsp_output)) { create_output_dir(compiler.build.ir_file_dir); } - if (compiler.build.asm_file_dir && compiler.build.emit_asm) + if (compiler.build.emit_asm) { create_output_dir(compiler.build.asm_file_dir); } - if (compiler.build.object_file_dir && compiler.build.emit_object_files) + if (compiler.build.emit_object_files) { create_output_dir(compiler.build.object_file_dir); }