Add a couple of debugging statements, update build configuration, fix some minor bugs.

4 files changed, 132 insertions, 394 deletions

diff --git a/MLKBinaryStreamCharacterStream.m b/MLKBinaryStreamCharacterStream.m
index 4efe6e7..f26db7b 100644
--- a/MLKBinaryStreamCharacterStream.m
+++ b/MLKBinaryStreamCharacterStream.m
@@ -54,11 +54,12 @@
     {
       NSString *tmpstr;
 
-      //NSLog (@"%@", _input);
-
       buffer = (uint8_t *) realloc (buffer, i+1);
       buffer[i] = [_binaryStream readOctet];
 
+      //NSLog (@"%@", _binaryStream);
+      //NSLog(@"Read: 0x%x (%C)", buffer[i], buffer[i]);
+
       tmpstr = [[NSString alloc] initWithBytes:buffer
                                  length:(i+1)
                                  encoding:_encoding];
@@ -66,7 +67,8 @@
         {
           retval = [tmpstr characterAtIndex:0];
           [tmpstr release];
-          //FIXME: ? free (buffer);
+          //NSLog(@"Finished reading char: 0x%x (%C)", retval, retval);
+          //FIXME: ? free (butval);
           return retval;
         }
       else
diff --git a/MLKCharacterStream.m b/MLKCharacterStream.m
index a152060..0849408 100644
--- a/MLKCharacterStream.m
+++ b/MLKCharacterStream.m
@@ -41,7 +41,7 @@
 {
   if (_charCached)
     {
-      char ch;
+      unichar ch;
       ch = _cachedChar;
       _cachedChar = 0;
       _charCached = NO;
diff --git a/MLKReader.m b/MLKReader.m
index 66826d9..2af2c2b 100644
--- a/MLKReader.m
+++ b/MLKReader.m
@@ -155,6 +155,7 @@ readingUninternedSymbol:(BOOL)readingUninternedSymbol
           (escaped && (![readtable isMultipleEscapeCharacter:ch]
                        && ![readtable isSingleEscapeCharacter:ch])))
         {
+          //NSLog (@"Constituent: 0x%x (%C)", ch, ch);
           if (escaped)
             [token appendFormat:@"%C", ch];
           else
@@ -162,6 +163,7 @@ readingUninternedSymbol:(BOOL)readingUninternedSymbol
         }
       else if ([readtable isSingleEscapeCharacter:ch])
         {
+          //NSLog (@"Escape");
           if ([stream isEOF])
             [NSException raise:@"MLKEndOfFileError"
                          format:@"Premature end of file on stream %@.", stream];
@@ -171,11 +173,13 @@ readingUninternedSymbol:(BOOL)readingUninternedSymbol
         }
       else if ([readtable isMultipleEscapeCharacter:ch])
         {
+          //NSLog (@"Multi-Escape");
           ever_escaped = YES;
           escaped = !escaped;
         }
       else if ([readtable isTerminatingMacroCharacter:ch])
         {
+          //NSLog (@"Terminating macro char");
           [stream unreadChar:ch];
           break;
         }
@@ -188,10 +192,16 @@ readingUninternedSymbol:(BOOL)readingUninternedSymbol
         }
       else if ([readtable isWhitespaceCharacter:ch])
         {
+          //NSLog (@"Whitespace");
           if (preserveWhitespace)
             [stream unreadChar:ch];
           break;
         }
+      else {
+        [NSException raise:@"MLKReaderError"
+                     format:@"'%c' is an unrecognized character.", ch];
+      }
+      //NSLog(@"Token now: %@", token);
     }
 
   //NSLog (@"--> Interpret token: %@", token);
@@ -271,6 +281,8 @@ readingUninternedSymbol:(BOOL)readingUninternedSymbol
              escaped:(BOOL)escaped
 {
   int base;
+    
+  //NSLog(@"Interpreting token: %@", token);
 
   base = [[[MLKDynamicContext currentContext]
             valueForSymbol:[[MLKPackage findPackage:@"COMMON-LISP"]
diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj
index a837174..ce46b7f 100644
--- a/Toilet Lisp.xcodeproj/project.pbxproj
+++ b/Toilet Lisp.xcodeproj/project.pbxproj
@@ -2044,7 +2044,6 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				"GCC_VERSION[arch=*]" = "";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				HEADER_SEARCH_PATHS = (
 					/opt/homebrew/include,
@@ -2067,87 +2066,42 @@
 					"-ledit",
 					"-framework",
 					ToiletKit,
+					"-L/opt/homebrew/lib",
 					"-L/opt/local/lib",
 					"-lpthread",
 					"-lm",
-					"-lLLVMipo",
+					"-lLLVMObject",
+					"-lLLVMMCJIT",
+					"-lLLVMMCDisassembler",
 					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=i386]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
 					"-lLLVMipo",
-					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMInterpreter.o,
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMX86AsmPrinter.o,
-					/opt/local/lib/LLVMX86CodeGen.o,
+					"-lLLVMInterpreter",
+					"-lLLVMInstrumentation",
+					"-lLLVMJIT",
+					"-lLLVMExecutionEngine",
+					"-lLLVMBitWriter",
+					"-lLLVMX86Disassembler",
+					"-lLLVMX86AsmParser",
+					"-lLLVMX86CodeGen",
 					"-lLLVMSelectionDAG",
+					"-lLLVMX86AsmPrinter",
+					"-lLLVMX86Utils",
+					"-lLLVMX86Info",
 					"-lLLVMAsmPrinter",
+					"-lLLVMMCParser",
 					"-lLLVMCodeGen",
 					"-lLLVMScalarOpts",
+					"-lLLVMInstCombine",
 					"-lLLVMTransformUtils",
 					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=ppc]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
-					"-lLLVMipo",
-					"-lLLVMLinker",
+					"-lLLVMAsmParser",
 					"-lLLVMArchive",
 					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
 					"-lLLVMAnalysis",
 					"-lLLVMTarget",
+					"-lLLVMMC",
 					"-lLLVMCore",
 					"-lLLVMSupport",
-					"-lLLVMSystem",
 					"-lstdc++",
 				);
 				PRODUCT_NAME = toilet;
@@ -2233,7 +2187,6 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h";
-				"GCC_VERSION[arch=*]" = "";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				HEADER_SEARCH_PATHS = (
 					/opt/homebrew/include,
@@ -2256,87 +2209,42 @@
 					"-ledit",
 					"-framework",
 					ToiletKit,
+					"-L/opt/homebrew/lib",
 					"-L/opt/local/lib",
 					"-lpthread",
 					"-lm",
-					"-lLLVMipo",
+					"-lLLVMObject",
+					"-lLLVMMCJIT",
+					"-lLLVMMCDisassembler",
 					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=i386]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
 					"-lLLVMipo",
-					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMInterpreter.o,
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMX86AsmPrinter.o,
-					/opt/local/lib/LLVMX86CodeGen.o,
+					"-lLLVMInterpreter",
+					"-lLLVMInstrumentation",
+					"-lLLVMJIT",
+					"-lLLVMExecutionEngine",
+					"-lLLVMBitWriter",
+					"-lLLVMX86Disassembler",
+					"-lLLVMX86AsmParser",
+					"-lLLVMX86CodeGen",
 					"-lLLVMSelectionDAG",
+					"-lLLVMX86AsmPrinter",
+					"-lLLVMX86Utils",
+					"-lLLVMX86Info",
 					"-lLLVMAsmPrinter",
+					"-lLLVMMCParser",
 					"-lLLVMCodeGen",
 					"-lLLVMScalarOpts",
+					"-lLLVMInstCombine",
 					"-lLLVMTransformUtils",
 					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=ppc]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
-					"-lLLVMipo",
-					"-lLLVMLinker",
+					"-lLLVMAsmParser",
 					"-lLLVMArchive",
 					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
 					"-lLLVMAnalysis",
 					"-lLLVMTarget",
+					"-lLLVMMC",
 					"-lLLVMCore",
 					"-lLLVMSupport",
-					"-lLLVMSystem",
 					"-lstdc++",
 				);
 				PRODUCT_NAME = toilet;
@@ -2475,7 +2383,6 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				"GCC_VERSION[arch=*]" = "";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				HEADER_SEARCH_PATHS = (
 					/opt/homebrew/include,
@@ -2498,87 +2405,42 @@
 					"-ledit",
 					"-framework",
 					ToiletKit,
+					"-L/opt/homebrew/lib",
 					"-L/opt/local/lib",
 					"-lpthread",
 					"-lm",
-					"-lLLVMipo",
+					"-lLLVMObject",
+					"-lLLVMMCJIT",
+					"-lLLVMMCDisassembler",
 					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=i386]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
 					"-lLLVMipo",
-					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMInterpreter.o,
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMX86AsmPrinter.o,
-					/opt/local/lib/LLVMX86CodeGen.o,
+					"-lLLVMInterpreter",
+					"-lLLVMInstrumentation",
+					"-lLLVMJIT",
+					"-lLLVMExecutionEngine",
+					"-lLLVMBitWriter",
+					"-lLLVMX86Disassembler",
+					"-lLLVMX86AsmParser",
+					"-lLLVMX86CodeGen",
 					"-lLLVMSelectionDAG",
+					"-lLLVMX86AsmPrinter",
+					"-lLLVMX86Utils",
+					"-lLLVMX86Info",
 					"-lLLVMAsmPrinter",
+					"-lLLVMMCParser",
 					"-lLLVMCodeGen",
 					"-lLLVMScalarOpts",
+					"-lLLVMInstCombine",
 					"-lLLVMTransformUtils",
 					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=ppc]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
-					"-lLLVMipo",
-					"-lLLVMLinker",
+					"-lLLVMAsmParser",
 					"-lLLVMArchive",
 					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
 					"-lLLVMAnalysis",
 					"-lLLVMTarget",
+					"-lLLVMMC",
 					"-lLLVMCore",
 					"-lLLVMSupport",
-					"-lLLVMSystem",
 					"-lstdc++",
 				);
 				PRODUCT_NAME = toilet;
@@ -2603,7 +2465,6 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				"GCC_VERSION[arch=*]" = "";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				HEADER_SEARCH_PATHS = (
 					/opt/homebrew/include,
@@ -2626,87 +2487,42 @@
 					"-ledit",
 					"-framework",
 					ToiletKit,
+					"-L/opt/homebrew/lib",
 					"-L/opt/local/lib",
 					"-lpthread",
 					"-lm",
-					"-lLLVMipo",
+					"-lLLVMObject",
+					"-lLLVMMCJIT",
+					"-lLLVMMCDisassembler",
 					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=i386]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
 					"-lLLVMipo",
-					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMInterpreter.o,
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMX86AsmPrinter.o,
-					/opt/local/lib/LLVMX86CodeGen.o,
+					"-lLLVMInterpreter",
+					"-lLLVMInstrumentation",
+					"-lLLVMJIT",
+					"-lLLVMExecutionEngine",
+					"-lLLVMBitWriter",
+					"-lLLVMX86Disassembler",
+					"-lLLVMX86AsmParser",
+					"-lLLVMX86CodeGen",
 					"-lLLVMSelectionDAG",
+					"-lLLVMX86AsmPrinter",
+					"-lLLVMX86Utils",
+					"-lLLVMX86Info",
 					"-lLLVMAsmPrinter",
+					"-lLLVMMCParser",
 					"-lLLVMCodeGen",
 					"-lLLVMScalarOpts",
+					"-lLLVMInstCombine",
 					"-lLLVMTransformUtils",
 					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=ppc]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
-					"-lLLVMipo",
-					"-lLLVMLinker",
+					"-lLLVMAsmParser",
 					"-lLLVMArchive",
 					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
 					"-lLLVMAnalysis",
 					"-lLLVMTarget",
+					"-lLLVMMC",
 					"-lLLVMCore",
 					"-lLLVMSupport",
-					"-lLLVMSystem",
 					"-lstdc++",
 				);
 				PRODUCT_NAME = toilet;
@@ -2899,7 +2715,6 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				"GCC_VERSION[arch=*]" = "";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				HEADER_SEARCH_PATHS = (
 					/opt/homebrew/include,
@@ -2922,87 +2737,42 @@
 					"-ledit",
 					"-framework",
 					ToiletKit,
+					"-L/opt/homebrew/lib",
 					"-L/opt/local/lib",
 					"-lpthread",
 					"-lm",
-					"-lLLVMipo",
+					"-lLLVMObject",
+					"-lLLVMMCJIT",
+					"-lLLVMMCDisassembler",
 					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=i386]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
 					"-lLLVMipo",
-					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMInterpreter.o,
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMX86AsmPrinter.o,
-					/opt/local/lib/LLVMX86CodeGen.o,
+					"-lLLVMInterpreter",
+					"-lLLVMInstrumentation",
+					"-lLLVMJIT",
+					"-lLLVMExecutionEngine",
+					"-lLLVMBitWriter",
+					"-lLLVMX86Disassembler",
+					"-lLLVMX86AsmParser",
+					"-lLLVMX86CodeGen",
 					"-lLLVMSelectionDAG",
+					"-lLLVMX86AsmPrinter",
+					"-lLLVMX86Utils",
+					"-lLLVMX86Info",
 					"-lLLVMAsmPrinter",
+					"-lLLVMMCParser",
 					"-lLLVMCodeGen",
 					"-lLLVMScalarOpts",
+					"-lLLVMInstCombine",
 					"-lLLVMTransformUtils",
 					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=ppc]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
-					"-lLLVMipo",
-					"-lLLVMLinker",
+					"-lLLVMAsmParser",
 					"-lLLVMArchive",
 					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
 					"-lLLVMAnalysis",
 					"-lLLVMTarget",
+					"-lLLVMMC",
 					"-lLLVMCore",
 					"-lLLVMSupport",
-					"-lLLVMSystem",
 					"-lstdc++",
 				);
 				PRODUCT_NAME = toilet;
@@ -3025,7 +2795,6 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				"GCC_VERSION[arch=*]" = "";
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				HEADER_SEARCH_PATHS = (
 					/opt/homebrew/include,
@@ -3048,87 +2817,42 @@
 					"-ledit",
 					"-framework",
 					ToiletKit,
+					"-L/opt/homebrew/lib",
 					"-L/opt/local/lib",
 					"-lpthread",
 					"-lm",
-					"-lLLVMipo",
+					"-lLLVMObject",
+					"-lLLVMMCJIT",
+					"-lLLVMMCDisassembler",
 					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=i386]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
 					"-lLLVMipo",
-					"-lLLVMLinker",
-					"-lLLVMArchive",
-					"-lLLVMBitReader",
-					/opt/local/lib/LLVMInterpreter.o,
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMX86AsmPrinter.o,
-					/opt/local/lib/LLVMX86CodeGen.o,
+					"-lLLVMInterpreter",
+					"-lLLVMInstrumentation",
+					"-lLLVMJIT",
+					"-lLLVMExecutionEngine",
+					"-lLLVMBitWriter",
+					"-lLLVMX86Disassembler",
+					"-lLLVMX86AsmParser",
+					"-lLLVMX86CodeGen",
 					"-lLLVMSelectionDAG",
+					"-lLLVMX86AsmPrinter",
+					"-lLLVMX86Utils",
+					"-lLLVMX86Info",
 					"-lLLVMAsmPrinter",
+					"-lLLVMMCParser",
 					"-lLLVMCodeGen",
 					"-lLLVMScalarOpts",
+					"-lLLVMInstCombine",
 					"-lLLVMTransformUtils",
 					"-lLLVMipa",
-					"-lLLVMAnalysis",
-					"-lLLVMTarget",
-					"-lLLVMCore",
-					"-lLLVMSupport",
-					"-lLLVMSystem",
-					"-lstdc++",
-				);
-				"OTHER_LDFLAGS[arch=ppc]" = (
-					"-framework",
-					Foundation,
-					"-lgmp",
-					"-ledit",
-					"-framework",
-					ToiletKit,
-					"-L/opt/local/lib",
-					"-lpthread",
-					"-lm",
-					"-lLLVMipo",
-					"-lLLVMLinker",
+					"-lLLVMAsmParser",
 					"-lLLVMArchive",
 					"-lLLVMBitReader",
-					/opt/local/lib/LLVMExecutionEngine.o,
-					/opt/local/lib/LLVMJIT.o,
-					/opt/local/lib/LLVMPowerPC.o,
-					"-lLLVMSelectionDAG",
-					"-lLLVMCodeGen",
-					"-lLLVMScalarOpts",
-					"-lLLVMTransformUtils",
-					"-lLLVMipa",
 					"-lLLVMAnalysis",
 					"-lLLVMTarget",
+					"-lLLVMMC",
 					"-lLLVMCore",
 					"-lLLVMSupport",
-					"-lLLVMSystem",
 					"-lstdc++",
 				);
 				PRODUCT_NAME = toilet;