4 files changed, 15 insertions, 4 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 093546fc9e0d..8024e3f5775f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -123,7 +123,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/all/filepath \
 ))
 
-ifneq (,$(filter IOS MACOSX,$(OS)))
+ifeq ($(OS),IOS)
 $(eval $(call gb_Library_add_cxxflags,sal,\
     $(gb_OBJCXXFLAGS) \
 ))
@@ -162,7 +162,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/process \
 	sal/osl/unx/process_impl \
         $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
-	sal/osl/unx/uunxapi \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/unx/mutex \
@@ -183,6 +182,17 @@ $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
 		-DSAL_ENABLE_CRASH_REPORT) \
 ))
 
+# Note that the uunxapi.mm file just includes the uunxapi.cxx one
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_objcxxobjects,sal,\
+	sal/osl/unx/uunxapi \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/osl/unx/uunxapi \
+))
+endif
+
 ifneq ($(filter $(OS),MACOSX IOS),)
 $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/osxlocale \
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 4ae6ef641ba0..571a79c82998 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 316f75a3bae1..d4116456b083 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sal/osl/unx/uunxapi.mm b/sal/osl/unx/uunxapi.mm
new file mode 100644
index 000000000000..5a7e17f34491
--- /dev/null
+++ b/sal/osl/unx/uunxapi.mm
@@ -0,0 +1 @@
+#include "uunxapi.cxx"