diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile b/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile
index 87df1920f6..b278371b67 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile
@@ -12,6 +12,8 @@ GHIDRA_BIN=../../../../../../../ghidra.bin
 OS = $(shell uname -s)
 CPU = $(shell uname -m)
 
+# TODO: need to revise to support arm64/aarch64 arch - improve on both OS and arch detection 
+
 ifeq ($(OS),Linux)
 # Allow ARCH to be specified externally so we can build for 32-bit from a 64-bit Linux
 ifndef ARCH
@@ -19,10 +21,10 @@ ifndef ARCH
 endif
 ifeq ($(ARCH),x86_64)
   ARCH_TYPE=-m64
-  OSDIR=linux64
+  OSDIR=linux_x86_64
 else
   ARCH_TYPE=-m32
-  OSDIR=linux32
+  OSDIR=linux_x86_32
 endif
 endif
 
@@ -30,7 +32,7 @@ ifeq ($(OS),Darwin)
   MAKE_STATIC=
   ARCH_TYPE=-arch x86_64
   ADDITIONAL_FLAGS=-mmacosx-version-min=10.6 -w
-  OSDIR=osx64
+  OSDIR=mac_x86_64
 endif
 
 CC=gcc