entered into RCS

2 files changed, 20 insertions, 2 deletions

diff --git a/src/s/sol2.h b/src/s/sol2.h
new file mode 100644
index 00000000000..e3b7b2d0378
--- /dev/null
+++ b/src/s/sol2.h
@@ -0,0 +1,14 @@
+#include "s-usg5-4.h"
+
+#define POSIX
+
+/* Here is how to find X Windows.  */
+#define LD_SWITCH_SYSTEM -L/usr/openwin/lib
+#define C_SWITCH_X_SYSTEM -I/usr/openwin/include
+
+/* Compile in non-ansi fashion to work around bugs in system header files.  */
+#ifndef __GNUC__
+#define C_SWITCH_SYSTEM -Xs
+#else /* GCC */
+#define C_SWITCH_SYSTEM -traditional
+#endif /* GCC */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 9ec1f14d56a..2c7139230d4 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -31,9 +31,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef NOMULTIPLEJOBS
 
-#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
+#define LIBS_SYSTEM -lsocket -lnsl -lelf
+#define ORDINARY_LINK
 
-#define LIB_STANDARD -lsocket -lnsl -lelf -lc /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o
+#if 0 /* These should be unnecessary now because of ORDINARY_LINK.  */
+#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
+#define LIB_STANDARD -lc /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o
+#endif
 
 /* No <sioctl.h> */