42 lines
1.3 KiB
Text
42 lines
1.3 KiB
Text
$NetBSD: patch-an,v 1.2 1998/08/07 10:40:22 agc Exp $
|
|
|
|
--- bcc/bcc.c.orig Sat Jul 17 07:49:49 1993
|
|
+++ bcc/bcc.c Thu Jul 16 22:45:40 1998
|
|
@@ -27,20 +27,20 @@
|
|
#define P(x) ()
|
|
#endif
|
|
|
|
-#define AS "as"
|
|
+#define AS "as86"
|
|
#define BAS86
|
|
#define BCC86
|
|
-#define CC1 "cc1"
|
|
+#define CC1 "bcc-cc1"
|
|
#define CC1_MINUS_O_BROKEN FALSE
|
|
-#define CPP "cpp" /* normally a link to /usr/bin/bcc-cc1 */
|
|
+#define CPP "bcc-cc1" /* normally a link to /usr/bin/bcc-cc1 */
|
|
#define CPPFLAGS "-E"
|
|
#define CRT0 "crt0.o"
|
|
#define GCC "gcc"
|
|
-#define LD "ld"
|
|
-#define STANDARD_CRT0_0_PREFIX "/usr/local/lib/i86/"
|
|
-#define STANDARD_CRT0_3_PREFIX "/usr/local/lib/i386/"
|
|
-#define STANDARD_EXEC_PREFIX "/usr/local/libexec/i386/bcc/"
|
|
-#define STANDARD_EXEC_PREFIX_2 "/usr/bin/"
|
|
+#define LD "ld86"
|
|
+#define STANDARD_CRT0_0_PREFIX LOCALPREFIX "/lib/bcc/i86/"
|
|
+#define STANDARD_CRT0_3_PREFIX LOCALPREFIX "/lib/bcc/i386/"
|
|
+#define STANDARD_EXEC_PREFIX LOCALPREFIX "/lib/bcc/"
|
|
+#define STANDARD_EXEC_PREFIX_2 LOCALPREFIX "/bin/"
|
|
|
|
#ifdef CCC
|
|
#undef BCC86
|
|
@@ -553,7 +553,7 @@
|
|
{
|
|
arg = ldargs.argv[argc];
|
|
if (arg[0] == '-' && arg[1] == 'i'
|
|
- && (arg[2] == 0 || arg[2] == '-' && arg[3] == 0))
|
|
+ && (arg[2] == 0 || (arg[2] == '-' && arg[3] == 0)))
|
|
{
|
|
--ldargs.argc;
|
|
memmove(ldargs.argv + argc, ldargs.argv + argc + 1,
|