mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-19 13:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix single-file package case

Browse Source
This commit is contained in:
Mark Naughton
2023-05-18 13:23:17 +01:00
parent 4b4481ea27
commit 413077a5d9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/build_settings.cpp
View File

@@ -1499,13 +1499,20 @@ gb_internal bool init_build_paths(String init_filename) {
} else if (build_context.build_mode == BuildMode_Executable) {
// By default use no executable extension.
output_extension = make_string(nullptr, 0);
String const single_file_extension = str_lit(".odin");
if (build_context.metrics.os == TargetOs_windows) {
output_extension = STR_LIT("exe");
} else if (build_context.cross_compiling && selected_target_metrics->metrics == &target_essence_amd64) {
output_extension = make_string(nullptr, 0);
} else if (path_is_directory(last_path_element(bc->build_paths[BuildPath_Main_Package].basename))) {
// Add .bin extension to avoid collision
// with package directory name
output_extension = STR_LIT("bin");
} else if (string_ends_with(init_filename, single_file_extension) && path_is_directory(remove_extension_from_path(init_filename))) {
// Add bin extension if compiling single-file package
// with same output name as a directory
output_extension = STR_LIT("bin");
}
} else if (build_context.build_mode == BuildMode_DynamicLibrary) {
// By default use a .so shared library extension.

2
src/path.cpp
View File

@@ -2,7 +2,7 @@
Path handling utilities.
*/
#if !defined(GB_SYSTEM_WINDOWS)
#include<unistd.h>
#include <unistd.h>
#endif
gb_internal String remove_extension_from_path(String const &s) {