patches/duma/2_5_1/100-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Oct 08 23:37:12 2010 +0200 (2010-10-08)
branch1.8
changeset 2150 f97a8ad2b172
parent 236 42650dc4e95e
permissions -rw-r--r--
cc/gcc: fix C++ headers location

In case we build the C++ compiler, we have to tell gcc where to put the C++
headers, or else it will try to # put it in prefix/tuple/include, which we
make a symlink to sysroot/usr/include during the build, and that we delete
(the symlink!) after the build, but gcc will not look in sysroot/usr/inlcude
for C++ headers by default.

Implements a fix suggested by: Bryan Hundven <bryanhundven@gmail.com>

Reported-by: Anthony Foiani <anthony.foiani@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from a0924619112015bdaa81a0a2313d21ef38607bc2)
yann@236
     1
diff -dur duma_2_5_1/Makefile duma_2_5_1.orig/Makefile
yann@236
     2
--- duma_2_5_1/Makefile	2006-06-18 06:02:13.000000000 +0200
yann@236
     3
+++ duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200
yann@236
     4
@@ -98,10 +98,6 @@
yann@236
     5
   LIBS=-lpthread
yann@236
     6
 endif
yann@236
     7
 
yann@236
     8
-
yann@236
     9
-CC=gcc
yann@236
    10
-CXX=g++
yann@236
    11
-AR=ar
yann@236
    12
 INSTALL=install
yann@236
    13
 
yann@236
    14
 ############################################################
yann@369
    15
@@ -169,7 +165,7 @@
yann@236
    16
 
yann@236
    17
 createconf: createconf.o
yann@236
    18
 	- rm -f createconf
yann@236
    19
-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
yann@369
    20
+	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
yann@236
    21
 
yann@236
    22
 tstheap: libduma.a tstheap.o
yann@236
    23
 	- rm -f tstheap
yann@236
    24
@@ -211,7 +207,7 @@
yann@236
    25
 # define rules how to build objects for createconf
yann@236
    26
 #
yann@236
    27
 createconf.o:
yann@236
    28
-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
yann@369
    29
+	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
yann@236
    30
 
yann@236
    31
 
yann@236
    32
 #