summarylogtreecommitdiffstats
path: root/0001-update-odin-to-use-llvm-12.patch
blob: 7d64116ed60904db0ab306459937e5aa561035b4 (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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
From 45705c2ccdfe4af2a1cf6b238525111c0c84693f Mon Sep 17 00:00:00 2001
From: pyxel <imhxnna@gmail.com>
Date: Mon, 1 Nov 2021 00:32:54 -0400
Subject: [PATCH] update odin to use llvm 12

---
 Makefile | 61 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 23fb7be6..15d00655 100644
--- a/Makefile
+++ b/Makefile
@@ -7,35 +7,38 @@ CC=clang
 
 OS=$(shell uname)
 
-ifeq ($(OS), Darwin)
-    LLVM_CONFIG=llvm-config
-    ifneq ($(shell llvm-config --version | grep '^11\.'),)
-        LLVM_CONFIG=llvm-config
-    else
-        $(error "Requirement: llvm-config must be version 11")
-    endif
-
-    LDFLAGS:=$(LDFLAGS) -liconv
-    CFLAGS:=$(CFLAGS) $(shell $(LLVM_CONFIG) --cxxflags --ldflags)
-    LDFLAGS:=$(LDFLAGS) -lLLVM-C
-endif
-ifeq ($(OS), Linux)
-    LLVM_CONFIG=llvm-config-11
-    ifneq ($(shell which llvm-config-11 2>/dev/null),)
-        LLVM_CONFIG=llvm-config-11
-    else ifneq ($(shell which llvm-config-11-64 2>/dev/null),)
-        LLVM_CONFIG=llvm-config-11-64
-    else
-        ifneq ($(shell llvm-config --version | grep '^11\.'),)
-            LLVM_CONFIG=llvm-config
-        else
-            $(error "Requirement: llvm-config must be version 11")
-        endif
-    endif
-
-    CFLAGS:=$(CFLAGS) $(shell $(LLVM_CONFIG) --cxxflags --ldflags)
-    LDFLAGS:=$(LDFLAGS) $(shell $(LLVM_CONFIG) --libs core native --system-libs)
-endif
+#ifeq ($(OS), Darwin)
+#    LLVM_CONFIG=llvm-config
+#    ifneq ($(shell llvm-config --version | grep '^11\.'),)
+#        LLVM_CONFIG=llvm-config
+#    else
+#        $(error "Requirement: llvm-config must be version 11")
+#    endif
+#
+#    LDFLAGS:=$(LDFLAGS) -liconv
+#    CFLAGS:=$(CFLAGS) $(shell $(LLVM_CONFIG) --cxxflags --ldflags)
+#    LDFLAGS:=$(LDFLAGS) -lLLVM-C
+#endif
+#ifeq ($(OS), Linux)
+#    LLVM_CONFIG=llvm-config-11
+#    ifneq ($(shell which llvm-config-11 2>/dev/null),)
+#        LLVM_CONFIG=llvm-config-11
+#    else ifneq ($(shell which llvm-config-11-64 2>/dev/null),)
+#        LLVM_CONFIG=llvm-config-11-64
+#    else
+#        ifneq ($(shell llvm-config --version | grep '^11\.'),)
+#            LLVM_CONFIG=llvm-config
+#        else
+#            $(error "Requirement: llvm-config must be version 11")
+#        endif
+#    endif
+#
+#    CFLAGS:=$(CFLAGS) $(shell $(LLVM_CONFIG) --cxxflags --ldflags)
+#    LDFLAGS:=$(LDFLAGS) $(shell $(LLVM_CONFIG) --libs core native --system-libs)
+#endif
+
+CFLAGS:=$(CFLAGS) $(shell llvm-config --cxxflags)
+LDFLAGS:=$(LDFLAGS) $(shell llvm-config --libs --ldflags) -lz -ltinfo
 
 all: debug demo
 
-- 
2.33.1