blob: c7c1b021c53b85d79b2da2a8cd05545b1f0f9bd2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From 7a8fce8a763f4ce5d750916cc0aae0c47e6d0a1b Mon Sep 17 00:00:00 2001
From: Josep Puigdemont <josep.puigdemont@enea.com>
Date: Thu, 8 May 2014 14:49:21 +0200
Subject: [PATCH 1/2] Makefile: use g++ from environment if available
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Upstream-Status: Pending
---
udt4/app/Makefile | 6 +++++-
udt4/src/Makefile | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/udt4/app/Makefile b/udt4/app/Makefile
index 9d16c0f..0ee2562 100644
--- a/udt4/app/Makefile
+++ b/udt4/app/Makefile
@@ -1,4 +1,8 @@
-C++ = g++
+ifndef CXX
+ C++ = g++
+else
+ C++ = $(CXX)
+endif
ifndef os
os = LINUX
diff --git a/udt4/src/Makefile b/udt4/src/Makefile
index bc1e049..1f64b8d 100644
--- a/udt4/src/Makefile
+++ b/udt4/src/Makefile
@@ -1,4 +1,8 @@
-C++ = g++
+ifndef CXX
+ C++ = g++
+else
+ C++ = $(CXX)
+endif
ifndef os
os = LINUX
--
1.9.0
|
