diff --git a/Makefile b/Makefile
index 2620a704..9b4ef9ce 100644
--- a/Makefile
+++ b/Makefile
@@ -179,9 +179,10 @@ OBJS += $(OBJS_COMMON)
 CFLAGS += $(addprefix -D,$(DEFINES))
 
 ifneq ($(findstring gcc,$(CC)),)
+ifneq ($(findstring SunOS,$(shell uname -a)),SunOS)
 LDFLAGS += -Wl,-Map=$(TARGET).map
 endif
-
+endif
 
 target_: $(TARGET)
 
diff --git a/Makefile.libretro b/Makefile.libretro
index 5483a334..26ee1c1e 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -53,6 +53,9 @@ ifeq ($(platform), unix)
 	DONT_COMPILE_IN_ZLIB = 1
 	CFLAGS += -DFAMEC_NO_GOTOS
 	use_sh2drc = 1
+ifneq ($(findstring SunOS,$(shell uname -a)),)
+	CC=gcc
+endif
 
 # Portable Linux
 else ifeq ($(platform), linux-portable)