summaryrefslogtreecommitdiffhomepage
path: root/src/CompilerKit
diff options
context:
space:
mode:
Diffstat (limited to 'src/CompilerKit')
-rw-r--r--src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc5
-rw-r--r--src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc b/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc
index 4eef11a..a3ed995 100644
--- a/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc
+++ b/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc
@@ -439,7 +439,7 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendNectarAMD64::Compile(
dont_accept_func:
break;
- accept_func : {
+ accept_func: {
if (kFunctionEmbedLevel > 0)
CompilerKit::Detail::print_error("Clojures are a work in progress feature.", file);
@@ -1551,8 +1551,7 @@ static void nectar_process_function_parameters(const std::vector<CompilerKit::ST
/////////////////////////////////////////////////////////////////////////////////////////
-#define kExtListCxx \
- { ".nc", ".pp.nc" }
+#define kExtListCxx {".nc", ".pp.nc"}
class AssemblyNectarInterfaceAMD64 final CK_ASSEMBLY_INTERFACE {
public:
diff --git a/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc b/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc
index 4d54ef7..a7e48dd 100644
--- a/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc
+++ b/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc
@@ -170,9 +170,9 @@ NECTAR_MODULE(DynamicLinker64MachO) {
} else if (std::strcmp(argv[linker_arg], "-dylib") == 0) {
kIsDylib = true;
- if (kOutput.find(".out") != CompilerKit::STLString::npos) {
- kOutput.erase(kOutput.find(".out"), strlen(".out"));
- kOutput += ".dylib";
+ if (kOutput.find(kMachOExt) != CompilerKit::STLString::npos) {
+ kOutput.erase(kOutput.find(kMachOExt), strlen(kMachOExt));
+ kOutput += kMachODylibExt;
}
continue;