diff options
| author |  Geoff Nixon <g-nix@users.noreply.github.com> | 2013-10-26 21:28:50 -0700 |
|---|---|---|
| committer |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2013-10-29 10:39:12 +0800 |
| commit | 3c65cd41a5c7cd1ec9deafa66ea10b95e9701483 (patch) | |
| tree | 8452b91fab625bcec03a29f27c12e9863027dd37 /Makefile.in | |
| parent | 8376a44f65d0f0acab3e6ab2802e7ab4a32f728e (diff) | |
Link with $CXXFLAGS; disable GCC-specific autoconf check (squash fixes).
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index dc3a5353..a8a24070 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,3 @@ - # Copyright (C) 2005-2006 Axel Liljencrantz # # This program is free software; you can redistribute it and/or modify @@ -742,7 +741,7 @@ uninstall-translations: # fish: $(FISH_OBJS) fish.o - $(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@ # @@ -750,7 +749,7 @@ fish: $(FISH_OBJS) fish.o # fish_pager: $(FISH_PAGER_OBJS) - $(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@ # @@ -758,7 +757,7 @@ fish_pager: $(FISH_PAGER_OBJS) # fishd: $(FISHD_OBJS) - $(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@ + $(CXX) $(CXXFLAGS) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@ # @@ -766,7 +765,7 @@ fishd: $(FISHD_OBJS) # fish_tests: $(FISH_TESTS_OBJS) - $(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@ # @@ -776,7 +775,7 @@ fish_tests: $(FISH_TESTS_OBJS) # mimedb: $(MIME_OBJS) - $(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@ + $(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@ # @@ -784,7 +783,7 @@ mimedb: $(MIME_OBJS) # fish_indent: $(FISH_INDENT_OBJS) - $(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@ + $(CXX) $(CXXFLAGS) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@ # @@ -792,7 +791,7 @@ fish_indent: $(FISH_INDENT_OBJS) # key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o - $(CXX) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@ + $(CXX) $(CXXFLAGS) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@ # |