diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-17 13:39:36 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-17 13:39:36 +0300 |
| commit | bdc8a5dcf17bae4d1207de725ecf84dfaa637b5a (patch) | |
| tree | 75973ec90d945899362db3f00ee25587f8e0ef0a | |
| parent | 2d8d658f8950d37eefbbd4c862f3c0f49c6d645d (diff) | |
| parent | e22971c8b31a8ed40b4bb770ba030db20ae75442 (diff) | |
| download | egawk-bdc8a5dcf17bae4d1207de725ecf84dfaa637b5a.tar.gz egawk-bdc8a5dcf17bae4d1207de725ecf84dfaa637b5a.tar.bz2 egawk-bdc8a5dcf17bae4d1207de725ecf84dfaa637b5a.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | pc/ChangeLog | 6 | ||||
| -rw-r--r-- | pc/Makefile.ext | 2 | ||||
| -rw-r--r-- | pc/Makefile.tst | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 3e65499d..6eade7da 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,9 @@ +2015-04-17 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (abs_top_builddir): Define. + + * Makefile.ext ($(SIMPLE_EXTENSIONS)): Really use -static-libgcc. + 2015-04-16 Arnold D. Robbins <arnold@skeeve.com> * Makefile.tst: Sync with mainline. diff --git a/pc/Makefile.ext b/pc/Makefile.ext index 12723436..6cd4d0f3 100644 --- a/pc/Makefile.ext +++ b/pc/Makefile.ext @@ -47,7 +47,7 @@ time.$(SOEXT): time.c gcc -DHAVE_GETSYSTEMTIMEASFILETIME -I.. -shared -gdwarf-2 -g3 -static-libgcc -o $@ time.c $(SIMPLE_EXTENSIONS): - gcc -I.. -shared -gdwarf-2 -g3 -o $@ $(@:.$(SOEXT)=.c) + gcc -I.. -shared -gdwarf-2 -g3 -static-libgcc -o $@ $(@:.$(SOEXT)=.c) $(ALL_EXTENSIONS): ../gawkapi.h ../gettext.h diff --git a/pc/Makefile.tst b/pc/Makefile.tst index bb8d437e..321aa99b 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -131,6 +131,7 @@ srcdir = . abs_srcdir = . abs_builddir = . top_srcdir = "$(srcdir)"/.. +abs_top_builddir = "$(top_srcdir)" # Get rid of core files when cleaning and generated .ok file CLEANFILES = core core.* fmtspcl.ok |