diff options
| author | Karl Heuer | 1997-10-21 02:57:44 +0000 |
|---|---|---|
| committer | Karl Heuer | 1997-10-21 02:57:44 +0000 |
| commit | 3c3a57e3debe388ec3959b94f6fd2b7cd9c27ab1 (patch) | |
| tree | 0f9fcd5ae7219f1b4f94154e1dc07ab3d27b1ca6 /src | |
| parent | 7d4c958f65501ef358cfd51734913e44c35e421c (diff) | |
| download | emacs-3c3a57e3debe388ec3959b94f6fd2b7cd9c27ab1.tar.gz emacs-3c3a57e3debe388ec3959b94f6fd2b7cd9c27ab1.zip | |
(LD_SWITCH_MACHINE): Conditionalize this
on THIS_IS_MAKEFILE instead of on emacs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/m/ibmrs6000.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 11b0e519276..fe876cb9462 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h | |||
| @@ -165,9 +165,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 165 | which most machines don't have. We use the name .inp instead of .imp | 165 | which most machines don't have. We use the name .inp instead of .imp |
| 166 | because .inp is a better convention to use in make-dist for naming | 166 | because .inp is a better convention to use in make-dist for naming |
| 167 | random input files. */ | 167 | random input files. */ |
| 168 | #ifdef emacs /* Prevent this from being used in configure. | 168 | #ifdef THIS_IS_MAKEFILE /* Don't use this in configure. */ |
| 169 | This also makes it not be used in lib-src, | ||
| 170 | but that is probably ok. */ | ||
| 171 | #ifdef AIX4 | 169 | #ifdef AIX4 |
| 172 | #define LD_SWITCH_MACHINE -Wl,-bnodelcsect | 170 | #define LD_SWITCH_MACHINE -Wl,-bnodelcsect |
| 173 | #else /* not AIX4 */ | 171 | #else /* not AIX4 */ |
| @@ -177,7 +175,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 177 | #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp | 175 | #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp |
| 178 | #endif | 176 | #endif |
| 179 | #endif /* not AIX4 */ | 177 | #endif /* not AIX4 */ |
| 180 | #endif | 178 | #endif /* THIS_IS_MAKEFILE */ |
| 181 | 179 | ||
| 182 | /* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead. */ | 180 | /* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead. */ |
| 183 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 7 | 181 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 7 |