From d76b6bf7d6c2feb722c6f059d36f2ecd11e93e83 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Thu, 7 May 2020 21:06:26 -0400
Subject: [PATCH] clang 10

---
 Makefile  |  6 +++---
 shell.nix | 22 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a8b0f5b..ccf81a9 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,7 @@ endif
 CC_CHECK := gcc -fsyntax-only -fsigned-char $(CC_CFLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -DNON_MATCHING -DAVOID_UB $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
 
 ASFLAGS := -march=vr4300 -mabi=32 -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS) $(GRUCODE_ASFLAGS)
-CFLAGS = -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(OPT_FLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(MIPSISET) $(GRUCODE_CFLAGS) -O3
+CFLAGS = -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(OPT_FLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(MIPSISET) $(GRUCODE_CFLAGS) -O4
 OBJCOPYFLAGS := --pad-to=0x800000 --gap-fill=0xFF
 SYMBOL_LINKING_FLAGS := $(addprefix -R ,$(SEG_FILES))
 LDFLAGS := -T undefined_syms.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(SYMBOL_LINKING_FLAGS)
@@ -369,8 +369,8 @@ else # TARGET_N64
 
 AS := as
 ifneq ($(TARGET_WEB),1)
-  CC := gcc
-  CXX := g++
+  CC := clang
+  CXX := clang++
 else
   CC := emcc
 endif
diff --git a/shell.nix b/shell.nix
index e4566cd..c611f0b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,20 @@
-let
-  pkgs = import <nixpkgs> {};
-in
-pkgs.mkShell {
+let pkgs = import <nixpkgs> { };
+in pkgs.mkShell {
   buildInputs = with pkgs; [
-    gnumake python3 audiofile pkg-config SDL2 libusb1 glfw3 libgcc xorg.libX11 xorg.libXrandr libpulseaudio alsaLib glfw libGL
+    gnumake
+    python3
+    audiofile
+    pkg-config
+    SDL2
+    libusb1
+    glfw3
+    libgcc
+    xorg.libX11
+    xorg.libXrandr
+    libpulseaudio
+    alsaLib
+    glfw
+    libGL
+    clang_10
   ];
 }