diff options
Diffstat (limited to 'mpi')
| -rw-r--r-- | mpi/ChangeLog | 5 | ||||
| -rw-r--r-- | mpi/Makefile.am | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 20175f961..00e0e3e6a 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +2005-03-11 Werner Koch <[email protected]> + + * Makefile.am (ASFLAGS): Renamed to AM_CCASFLAGS and added the + variable for non exectubale stack options. Adapted users. + 2004-12-20 Werner Koch <[email protected]> * mpicoder.c (mpi_read_from_buffer): Don't abort in case of an diff --git a/mpi/Makefile.am b/mpi/Makefile.am index 798a4d1dd..35135c24d 100644 --- a/mpi/Makefile.am +++ b/mpi/Makefile.am @@ -20,8 +20,8 @@ INCLUDES = -I.. -I$(top_srcdir)/include -AM_CFLAGS = @MPI_OPT_FLAGS@ -ASFLAGS = @MPI_SFLAGS@ +AM_CFLAGS = $(MPI_OPT_FLAGS) +AM_CCASFLAGS = $(NOEXECSTACK_FLAGS) $(MPI_SFLAGS) EXTRA_DIST = config.links DISTCLEANFILES = mpi-asm-defs.h \ @@ -73,7 +73,7 @@ libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ # work and add one to cpp .S files .S.o: $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s - $(COMPILE) $(ASFLAGS) -c _$*.s + $(COMPILE) $(AM_CCASFLAGS) -c _$*.s mv -f _$*.o $*.o .S.lo: |