You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
1.5 KiB
66 lines
1.5 KiB
--- fish-2.1.0/Makefile.in.orig 2013-12-13 09:12:28.963387757 -0800
|
|
+++ fish-2.1.0/Makefile.in 2013-12-13 09:12:55.599383681 -0800
|
|
@@ -742,7 +742,7 @@
|
|
#
|
|
|
|
fish: $(FISH_OBJS) fish.o
|
|
- $(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
|
|
+ $(CXX) $(CXXFLAGS) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
|
|
|
|
|
|
#
|
|
@@ -750,7 +750,7 @@
|
|
#
|
|
|
|
fish_pager: $(FISH_PAGER_OBJS)
|
|
- $(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
|
|
+ $(CXX) $(CXXFLAGS) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
|
|
|
|
|
|
#
|
|
@@ -758,7 +758,7 @@
|
|
#
|
|
|
|
fishd: $(FISHD_OBJS)
|
|
- $(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
|
|
+ $(CXX) $(CXXFLAGS) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
|
|
|
|
|
|
#
|
|
@@ -766,7 +766,7 @@
|
|
#
|
|
|
|
fish_tests: $(FISH_TESTS_OBJS)
|
|
- $(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
|
|
+ $(CXX) $(CXXFLAGS) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
|
|
|
|
|
|
#
|
|
@@ -776,7 +776,7 @@
|
|
#
|
|
|
|
mimedb: $(MIME_OBJS)
|
|
- $(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
|
|
+ $(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
|
|
|
|
|
|
#
|
|
@@ -784,7 +784,7 @@
|
|
#
|
|
|
|
fish_indent: $(FISH_INDENT_OBJS)
|
|
- $(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
|
|
+ $(CXX) $(CXXFLAGS) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
|
|
|
|
|
|
#
|
|
@@ -792,7 +792,7 @@
|
|
#
|
|
|
|
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 $@
|
|
|
|
|
|
#
|