1 files changed, 11 insertions, 2 deletions

diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index ff48ac59293..082730c3d8a 100644
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -11,5 +11,14 @@
 #define LIB_X11_LIB -L/usr/lib/X11R4 -lX11
 #define C_SWITCH_SYSTEM -I/usr/include/X11R4
 
-/* Don't use shared libraries.  unexec doesn't handle them.  */
-#define LD_SWITCH_SYSTEM -a archive
+/* Don't use shared libraries.  unexec doesn't handle them.
+   Note GCC automatically passes -a archive to ld, and it has its own
+   conflicting -a.  */
+#ifdef __GNUC__
+#define LD_SWITCH_SYSTEM  -L/usr/lib/X11R4
+
+/* No need to specify roundabout way of linking temacs.  */
+#define ORDINARY_LINK
+#else
+#define LD_SWITCH_SYSTEM -a archive  -L/usr/lib/X11R4
+#endif