diff options
| author | Richard M. Stallman | 1994-05-26 08:52:27 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-05-26 08:52:27 +0000 |
| commit | 235c56d4eaa418c59fd5645ddb2e4b07d8342f95 (patch) | |
| tree | a2919b024112130a459b5abc5f0911b14ffaf2c5 | |
| parent | bea169e96c70b9982327c82087ff41ddb64c1bf9 (diff) | |
| download | emacs-235c56d4eaa418c59fd5645ddb2e4b07d8342f95.tar.gz emacs-235c56d4eaa418c59fd5645ddb2e4b07d8342f95.zip | |
(LD_SWITCH_SYSTEM): Put back -Xlinker for GCC.
| -rw-r--r-- | src/s/hpux8.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/s/hpux8.h b/src/s/hpux8.h index 6960c4c6dc3..f2883bd21e2 100644 --- a/src/s/hpux8.h +++ b/src/s/hpux8.h | |||
| @@ -20,21 +20,28 @@ | |||
| 20 | #ifdef __GNUC__ | 20 | #ifdef __GNUC__ |
| 21 | /* No need to specify roundabout way of linking temacs. */ | 21 | /* No need to specify roundabout way of linking temacs. */ |
| 22 | #define ORDINARY_LINK | 22 | #define ORDINARY_LINK |
| 23 | |||
| 24 | #ifdef HPUX_USE_SHLIBS | ||
| 25 | #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4 | ||
| 26 | #else | ||
| 27 | #define LD_SWITCH_SYSTEM -Xlinker -a -Xlinker archive -L/usr/lib/X11R5 -L/usr/lib/X11R4 | ||
| 23 | #endif | 28 | #endif |
| 24 | 29 | ||
| 25 | #if ! defined (__GNUC__) && (defined(hp9000s700) || defined(__hp9000s700)) | 30 | #else /* not __GNUC__ */ |
| 31 | #if (defined(hp9000s700) || defined(__hp9000s700)) | ||
| 26 | #ifdef HPUX_USE_SHLIBS | 32 | #ifdef HPUX_USE_SHLIBS |
| 27 | #define LD_SWITCH_SYSTEM -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 33 | #define LD_SWITCH_SYSTEM -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4 |
| 28 | #else | 34 | #else |
| 29 | #define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 35 | #define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4 |
| 30 | #endif | 36 | #endif |
| 31 | #else /* __GNUC__ or not (defined(hp9000s700) || defined(__hp9000s700)) */ | 37 | #else /* not (defined(hp9000s700) || defined(__hp9000s700)) */ |
| 32 | #ifdef HPUX_USE_SHLIBS | 38 | #ifdef HPUX_USE_SHLIBS |
| 33 | #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 39 | #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4 |
| 34 | #else | 40 | #else |
| 35 | #define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4 | 41 | #define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4 |
| 36 | #endif | 42 | #endif |
| 37 | #endif /* __GNUC__ or not (defined(hp9000s700) || defined(__hp9000s700)) */ | 43 | #endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */ |
| 44 | #endif /* not __GNUC__ */ | ||
| 38 | 45 | ||
| 39 | /* Some hpux 8 machines seem to have TIOCGWINSZ, | 46 | /* Some hpux 8 machines seem to have TIOCGWINSZ, |
| 40 | and none have sioctl.h, so might as well define this. */ | 47 | and none have sioctl.h, so might as well define this. */ |