-/* Link in the Carbon lib. The -headerpad option tells ld (see man
- page) to leave room at the end of the header for adding load
- commands. Needed for dumping. 0x690 is the total size of 30
- segment load commands (at 56 each). */
-#define LD_SWITCH_SYSTEM_TEMACS -prebind -framework Carbon -lstdc++ -Xlinker -headerpad -Xlinker 690
+/* The -headerpad option tells ld (see man page) to leave room at the
+ end of the header for adding load commands. Needed for dumping.
+ 0x690 is the total size of 30 segment load commands (at 56
+ each). */
+#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_CARBON -Xlinker -headerpad -Xlinker 690