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

1 files changed, 114 insertions, 390 deletions

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;