Commit a6b98754 authored by Chong Yidong's avatar Chong Yidong
Browse files

* cedet/ede/proj-obj.el (ede-gcc-linker): New var.

(ede-proj-target-makefile-objectcode): Use it.
parent d7a39b51
2009-10-08 Chong Yidong <cyd@stupidchicken.com> 2009-10-08 Chong Yidong <cyd@stupidchicken.com>
* cedet/ede/proj-obj.el (ede-gcc-linker): New var.
(ede-proj-target-makefile-objectcode): Use it.
* cedet/ede/source.el (ede-want-any-source-files-p) * cedet/ede/source.el (ede-want-any-source-files-p)
(ede-want-any-auxiliary-files-p, ede-want-any-files-p): Return (ede-want-any-auxiliary-files-p, ede-want-any-files-p): Return
search result. This error was introduced while merging. search result. This error was introduced while merging.
......
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
;; fortran or pascal can be added here ;; fortran or pascal can be added here
)) ))
(availablelinkers :initform (ede-g++-linker (availablelinkers :initform (ede-g++-linker
;; Add more linker thingies here. ede-gcc-linker
ede-ld-linker
ede-gfortran-linker ede-gfortran-linker
ede-ld-linker
;; Add more linker thingies here.
)) ))
(sourcetype :initform (ede-source-c (sourcetype :initform (ede-source-c
ede-source-c++ ede-source-c++
...@@ -107,6 +108,16 @@ file.") ...@@ -107,6 +108,16 @@ file.")
:uselinker t) :uselinker t)
"Compiler for C sourcecode.") "Compiler for C sourcecode.")
(defvar ede-gcc-linker
(ede-linker
"ede-gcc-linker"
:name "gcc"
:sourcetype '(ede-source-c)
:variables '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L."))
:commands '("$(C_LINK) -o $@ $^")
:objectextention "")
"Linker for C sourcecode.")
(defvar ede-source-c++ (defvar ede-source-c++
(ede-sourcecode "ede-source-c++" (ede-sourcecode "ede-source-c++"
:name "C++" :name "C++"
...@@ -145,10 +156,8 @@ file.") ...@@ -145,10 +156,8 @@ file.")
:name "g++" :name "g++"
;; Only use this linker when c++ exists. ;; Only use this linker when c++ exists.
:sourcetype '(ede-source-c++) :sourcetype '(ede-source-c++)
:variables '(("CXX_LINK" . :variables '(("CXX_LINK" . "$(CXX) $(CFLAGS) $(LDFLAGS) -L."))
"$(CXX) $(CFLAGS) $(LDFLAGS) -L. -o $@") :commands '("$(CXX_LINK) -o $@ $^")
)
:commands '("$(CXX_LINK) $^")
:autoconf '("AC_PROG_CXX") :autoconf '("AC_PROG_CXX")
:objectextention "") :objectextention "")
"Linker needed for c++ programs.") "Linker needed for c++ programs.")
...@@ -210,10 +219,8 @@ file.") ...@@ -210,10 +219,8 @@ file.")
"ede-gfortran-linker" "ede-gfortran-linker"
:name "gfortran" :name "gfortran"
:sourcetype '(ede-source-f90 ede-source-f77) :sourcetype '(ede-source-f90 ede-source-f77)
:variables '(("F90_LINK" . :variables '(("F90_LINK" . "$(F90) $(CFLAGS) $(LDFLAGS) -L."))
"$(F90) $(CFLAGS) $(LDFLAGS) -L. -o $@") :commands '("$(F90_LINK) -o $@ $^")
)
:commands '("$(F90_LINK) $^")
:objectextention "") :objectextention "")
"Linker needed for Fortran programs.") "Linker needed for Fortran programs.")
...@@ -224,10 +231,8 @@ file.") ...@@ -224,10 +231,8 @@ file.")
"ede-ld-linker" "ede-ld-linker"
:name "ld" :name "ld"
:variables '(("LD" . "ld") :variables '(("LD" . "ld")
("LD_LINK" . ("LD_LINK" . "$(LD) $(LDFLAGS) -L."))
"$(LD) $(LDFLAGS) -L. -o $@") :commands '("$(LD_LINK) -o $@ $^")
)
:commands '("$(LD_LINK) $^")
:objectextention "") :objectextention "")
"Linker needed for c++ programs.") "Linker needed for c++ programs.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment