diff options
| author | Dan Nicolaescu | 2010-09-21 01:35:37 +0300 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-09-21 01:35:37 +0300 |
| commit | f5ea3ba7ccf9174cbb1c115cf185632cfe44f655 (patch) | |
| tree | 8f1268550b6d437a785f7aea69ae0317a3bc0178 /src | |
| parent | 984edd2215e74d54d387c7e8fa2fd14ee43ff5f0 (diff) | |
| download | emacs-f5ea3ba7ccf9174cbb1c115cf185632cfe44f655.tar.gz emacs-f5ea3ba7ccf9174cbb1c115cf185632cfe44f655.zip | |
Link temacs using $(CC) not $(LD).
* configure.in (LINKER): Rename to LD_FIRSTFLAG, do not include $(CC).
* src/Makefile.in (temacs): Link using $(CC) not $(LD).
(LD_FIRSTFLAG): Define using autoconf.
(LD): Remove.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index d91b95d86e3..7fe3fe0ae81 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -35,6 +35,7 @@ CC = @CC@ | |||
| 35 | CFLAGS = @CFLAGS@ | 35 | CFLAGS = @CFLAGS@ |
| 36 | CPPFLAGS = @CPPFLAGS@ | 36 | CPPFLAGS = @CPPFLAGS@ |
| 37 | LDFLAGS = @LDFLAGS@ | 37 | LDFLAGS = @LDFLAGS@ |
| 38 | LD_FIRSTFLAG=@LD_FIRSTFLAG@ | ||
| 38 | EXEEXT = @EXEEXT@ | 39 | EXEEXT = @EXEEXT@ |
| 39 | version = @version@ | 40 | version = @version@ |
| 40 | # Substitute an assignment for the MAKE variable, because | 41 | # Substitute an assignment for the MAKE variable, because |
| @@ -124,8 +125,6 @@ LIBS_SYSTEM=@LIBS_SYSTEM@ | |||
| 124 | ## Where to find libgcc.a, if using gcc and necessary. | 125 | ## Where to find libgcc.a, if using gcc and necessary. |
| 125 | LIB_GCC=@LIB_GCC@ | 126 | LIB_GCC=@LIB_GCC@ |
| 126 | 127 | ||
| 127 | LD=@LINKER@ | ||
| 128 | |||
| 129 | ## May use $CRT_DIR. | 128 | ## May use $CRT_DIR. |
| 130 | LIB_STANDARD=@LIB_STANDARD@ | 129 | LIB_STANDARD=@LIB_STANDARD@ |
| 131 | 130 | ||
| @@ -646,7 +645,7 @@ buildobj.h: Makefile | |||
| 646 | 645 | ||
| 647 | 646 | ||
| 648 | temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} | 647 | temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} |
| 649 | $(LD) ${TEMACS_LDFLAGS} ${TEMACS_LDFLAGS2} \ | 648 | $(CC) $(LD_FIRSTFLAG) ${TEMACS_LDFLAGS} ${TEMACS_LDFLAGS2} \ |
| 650 | -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} | 649 | -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} |
| 651 | 650 | ||
| 652 | ## The following oldxmenu-related rules are only (possibly) used if | 651 | ## The following oldxmenu-related rules are only (possibly) used if |