diff options
| author | Steven Tamm <steventamm@mac.com> | 2004-09-02 17:02:11 +0000 |
|---|---|---|
| committer | Steven Tamm <steventamm@mac.com> | 2004-09-02 17:02:11 +0000 |
| commit | 640a07706b1bdd45a0cbaadd49b72d2c5d79377b (patch) | |
| tree | 177fcbb90622f6c7a998de9938a322238475e56e | |
| parent | b15de4146bcbd6efa054b2c6235c733f42d8bfc2 (diff) | |
| download | emacs-640a07706b1bdd45a0cbaadd49b72d2c5d79377b.tar.gz | |
(LIBS_CARBON): New define to specify libraries for
Carbon support.
(LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++. Use
LIBS_CARBON.
| -rw-r--r-- | src/s/darwin.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index 814de2c2c51..f854ed9380b 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -243,11 +243,18 @@ Boston, MA 02111-1307, USA. */ specific headers. */ #define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src -/* Link in the Carbon lib. The -headerpad option tells ld (see man - page) to leave room at the end of the header for adding load - commands. Needed for dumping. 0x690 is the total size of 30 - segment load commands (at 56 each). */ -#define LD_SWITCH_SYSTEM_TEMACS -prebind -framework Carbon -framework QuickTime -lstdc++ -Xlinker -headerpad -Xlinker 690 +/* Link in the Carbon lib. */ +#ifdef HAVE_CARBON +#define LIBS_CARBON -framework Carbon -framework QuickTime +#else +#define LIBS_CARBON -framework Carbon +#endif + +/* The -headerpad option tells ld (see man page) to leave room at the + end of the header for adding load commands. Needed for dumping. + 0x690 is the total size of 30 segment load commands (at 56 + each). */ +#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_CARBON -Xlinker -headerpad -Xlinker 690 #define C_SWITCH_SYSTEM_TEMACS -Dtemacs |