summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2016-08-17 18:36:04 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2016-08-17 18:36:36 +0200
commit5dad45d798eaaeaa4c6e480e4ce4cd06964e7a1f (patch)
tree25057707c5e1283b316387f2d7b142c311caa60c
parent5e1476af00466e657290d952365f2cf91a59a614 (diff)
firebird: have built-in cloop use same compiler as everyone else
Change-Id: I44cbbc82e34b9f4047a2fbebc3b959e3e148452a
-rw-r--r--external/firebird/UnpackedTarball_firebird.mk1
-rw-r--r--external/firebird/firebird-cloop-compiler.patch.112
2 files changed, 13 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index eebe4d0c999c..5715d0c17288 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
external/firebird/firebird-rpath.patch.0 \
+ external/firebird/firebird-cloop-compiler.patch.1 \
))
ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-cloop-compiler.patch.1 b/external/firebird/firebird-cloop-compiler.patch.1
new file mode 100644
index 000000000000..ac82bb0caa46
--- /dev/null
+++ b/external/firebird/firebird-cloop-compiler.patch.1
@@ -0,0 +1,12 @@
+diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile
+--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200
++++ firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200
+@@ -4,8 +4,6 @@
+
+ TARGET := release
+
+-CC := gcc
+-CXX := g++
+ LD := $(CXX)
+
+ SRC_DIR := src