summaryrefslogtreecommitdiff
path: root/devel/tpasm/patches
diff options
context:
space:
mode:
authorsketch <sketch@pkgsrc.org>2003-12-02 17:59:45 +0000
committersketch <sketch@pkgsrc.org>2003-12-02 17:59:45 +0000
commit6647a5c2e607b9b02bb7f80764793284326c332f (patch)
tree999967f8a6129a9423e632aceaa9a8a8dd852d71 /devel/tpasm/patches
parent483462aee8098406799f1990a711694f082ecedc (diff)
downloadpkgsrc-6647a5c2e607b9b02bb7f80764793284326c332f.tar.gz
Ensure the same compiler is used to both compile and link the program,
fixing the GCC 3 breakage exhibited in pkg/23424. This also fixes the build using Sun CC on Solaris.
Diffstat (limited to 'devel/tpasm/patches')
-rw-r--r--devel/tpasm/patches/patch-aa29
1 files changed, 29 insertions, 0 deletions
diff --git a/devel/tpasm/patches/patch-aa b/devel/tpasm/patches/patch-aa
new file mode 100644
index 00000000000..178ed1906d0
--- /dev/null
+++ b/devel/tpasm/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.3 2003/12/02 17:59:45 sketch Exp $
+
+--- Makefile.orig 2003-12-02 17:09:48.000000000 +0000
++++ Makefile 2003-12-02 17:12:02.000000000 +0000
+@@ -16,7 +16,7 @@
+ INCLUDES=-I.
+
+ OPTIONS=-O2 -Wall -x c++
+-CFLAGS=$(INCLUDES) $(OPTIONS)
++CFLAGS += $(INCLUDES)
+
+ OBJECTS = \
+ globals.o \
+@@ -65,7 +65,7 @@
+ all : tpasm
+
+ tpasm : $(OBJECTS)
+- $(CC) -O $(OBJECTS) -o tpasm
++ $(CXX) $(CFLAGS) $(OBJECTS) -o tpasm
+
+ clean :
+ rm -f *.o
+@@ -79,5 +79,5 @@
+ # suffix rules (this makes sure that the ".o" files
+ # end up in their respective directories on all systems)
+ .c.o:
+- ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
++ ${CXX} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
+