aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1993-01-25 20:11:29 +0000
committerRichard M. Stallman <[email protected]>1993-01-25 20:11:29 +0000
commitbaacd4229e33fd1835a3b21abfcb594b0b3d3a82 (patch)
treef1cf046a83b6afa212fffd106fb3fae8bf73cd4e /src/s
parent63ed0aa079efeb008e2aeea3a677542f59b1a7b5 (diff)
[__GNUC__] (LD_SWITCH_SYSTEM): Remove -a.
[__GNUC__] (ORDINARY_LINK): Defined.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/hpux8.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index ff48ac5929..082730c3d8 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