diff options
| author | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-09 14:37:31 +0000 |
|---|---|---|
| committer | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-09 14:37:31 +0000 |
| commit | cfe87ee0388f818bd4e7014c656a1461fe716658 (patch) | |
| tree | 6c23875f961b80d37ae796be49d07a6f8b9ff11a /libgomp | |
| parent | 1f429ea0b702e1bcdc82f25a2a40a0ccf1615dd1 (diff) | |
* Makefile.am (LTLDFLAGS): Define.
(LINK): Define.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148311 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/Makefile.am | 5 | ||||
| -rw-r--r-- | libgomp/Makefile.in | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 65144c31101..63295bf4b09 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2009-06-09 Nathan Froyd <froydnj@codesourcery.com> + + * Makefile.am (LTLDFLAGS): Define. + (LINK): Define. + * Makefile.in: Regenerate. + 2009-05-27 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/39718 diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index d1967a0280b..ebb4b6ab8f7 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -41,6 +41,11 @@ if USE_FORTRAN nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod endif +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) + +LINK = $(LIBTOOL) --tag CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ + omp_lib_kinds.mod: omp_lib.mod : omp_lib.mod: omp_lib.f90 diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index fe709e82734..a1e3afc484b 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -97,8 +97,6 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libgomp_la_SOURCES) DIST_SOURCES = $(libgomp_la_SOURCES) MULTISRCTOP = @@ -317,6 +315,9 @@ libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \ nodist_noinst_HEADERS = libgomp_f.h nodist_libsubinclude_HEADERS = omp.h @USE_FORTRAN_TRUE@nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ # Automake Documentation: # If your package has Texinfo files in many directories, you can use the |