File: 0003-CC-variable-does-not-exist-in-4.05.0-s-Makefile.conf.patch

package info (click to toggle)
labltk 8.06.2%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 2,084 kB
  • ctags: 2,334
  • sloc: ml: 12,266; ansic: 1,014; makefile: 567; sh: 279; tcl: 2
file content (35 lines) | stat: -rw-r--r-- 1,004 bytes parent folder | download
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
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 16 Jul 2017 08:20:45 +0000
Subject: CC variable does not exist in 4.05.0's Makefile.config

---
 configure        | 2 +-
 support/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 6c93d8a..1c58a4c 100755
--- a/configure
+++ b/configure
@@ -158,7 +158,7 @@ else
   has_tk=true
 fi
 
-cc=`cat $where/Makefile.config | grep '^CC=' | sed -e 's/^CC=//'`
+cc=`cat $where/Makefile.config | grep '^NATIVECC=' | sed -e 's/^NATIVECC=//'`
 cclibs=`cat $where/Makefile.config | grep '^NATIVECCLIBS=' | sed -e 's/^NATIVECCLIBS=//'`
 export cc cclibs
 
diff --git a/support/Makefile b/support/Makefile
index 9d88d02..0be3668 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -84,7 +84,7 @@ clean:
 	$(CAMLOPT) -c $(COMPFLAGS) $<
 
 .c.$(O):
-	$(CC) $(BYTECCCOMPOPTS) $(CCFLAGS) -c $<
+	$(BYTECC) $(BYTECCCOMPOPTS) $(CCFLAGS) -c $<
 
 tkthread.cmi: tkthread.mli
 	$(CAMLCOMP) $(COMPFLAGS) $(THFLAGS) $<