Lines 1-97
Link Here
|
1 |
--- Makefile.orig 2017-12-17 14:07:55 UTC |
1 |
--- Makefile.orig 2018-05-27 18:29:53 UTC |
2 |
+++ Makefile |
2 |
+++ Makefile |
3 |
@@ -87,7 +87,8 @@ else |
3 |
@@ -221,6 +221,10 @@ ifndef LLVM_CONFIG |
4 |
endif |
4 |
LLVM_CONFIG = llvm-config-3.9 |
5 |
|
5 |
else ifneq (,$(shell which /usr/local/opt/llvm@3.9/bin/llvm-config 2> /dev/null)) |
6 |
prefix ?= /usr/local |
6 |
LLVM_CONFIG = /usr/local/opt/llvm@3.9/bin/llvm-config |
7 |
-destdir ?= $(prefix)/lib/pony/$(tag) |
|
|
8 |
+destdir ?= |
9 |
+libdir ?= lib/pony/$(tag) |
10 |
|
11 |
LIB_EXT ?= a |
12 |
BUILD_FLAGS = -march=$(arch) -mtune=$(tune) -Werror -Wconversion \ |
13 |
@@ -244,10 +245,10 @@ ifndef LLVM_CONFIG |
14 |
LLVM_CONFIG = llvm-config |
15 |
LLVM_LINK = llvm-link |
16 |
LLVM_OPT = opt |
17 |
- else ifneq (,$(shell which llvm-config-5.0 2> /dev/null)) |
18 |
- LLVM_CONFIG = llvm-config-5.0 |
19 |
- LLVM_LINK = llvm-link-5.0 |
20 |
- LLVM_OPT = opt-5.0 |
21 |
+ else ifneq (,$(shell which llvm-config50 2> /dev/null)) |
7 |
+ else ifneq (,$(shell which llvm-config50 2> /dev/null)) |
22 |
+ LLVM_CONFIG = llvm-config50 |
8 |
+ LLVM_CONFIG = llvm-config50 |
23 |
+ LLVM_LINK = llvm-link50 |
9 |
+ else ifneq (,$(shell which llvm-config40 2> /dev/null)) |
24 |
+ LLVM_OPT = opt50 |
10 |
+ LLVM_CONFIG = llvm-config40 |
25 |
else ifneq (,$(shell which llvm-config-4.0 2> /dev/null)) |
11 |
else ifneq (,$(shell which llvm-config39 2> /dev/null)) |
26 |
LLVM_CONFIG = llvm-config-4.0 |
12 |
LLVM_CONFIG = llvm-config39 |
27 |
LLVM_LINK = llvm-link-4.0 |
13 |
else ifneq (,$(shell which /usr/local/opt/llvm/bin/llvm-config 2> /dev/null)) |
28 |
@@ -775,44 +776,44 @@ install: libponyc libponyrt libponyrt-pi |
|
|
29 |
else |
30 |
install: libponyc libponyrt ponyc |
31 |
endif |
32 |
- @mkdir -p $(destdir)/bin |
33 |
- @mkdir -p $(destdir)/docs-support |
34 |
- @mkdir -p $(destdir)/lib |
35 |
- @mkdir -p $(destdir)/include/pony/detail |
36 |
- $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.a $(destdir)/lib |
37 |
+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/bin |
38 |
+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/docs-support |
39 |
+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/lib |
40 |
+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/include/pony/detail |
41 |
+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.a $(destdir)/$(prefix)/$(libdir)/lib |
42 |
ifeq ($(OSTYPE),linux) |
43 |
- $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt-pic.a $(destdir)/lib |
44 |
+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt-pic.a $(destdir)/$(prefix)/$(libdir)/lib |
45 |
endif |
46 |
ifneq ($(wildcard $(PONY_BUILD_DIR)/libponyrt.bc),) |
47 |
- $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.bc $(destdir)/lib |
48 |
+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.bc $(destdir)/$(prefix)/$(libdir)/lib |
49 |
endif |
50 |
ifneq ($(wildcard $(PONY_BUILD_DIR)/libdtrace_probes.a),) |
51 |
- $(SILENT)cp $(PONY_BUILD_DIR)/libdtrace_probes.a $(destdir)/lib |
52 |
+ $(SILENT)cp $(PONY_BUILD_DIR)/libdtrace_probes.a $(destdir)/$(prefix)/$(libdir)/lib |
53 |
endif |
54 |
- $(SILENT)cp $(PONY_BUILD_DIR)/libponyc.a $(destdir)/lib |
55 |
- $(SILENT)cp $(PONY_BUILD_DIR)/ponyc $(destdir)/bin |
56 |
- $(SILENT)cp src/libponyrt/pony.h $(destdir)/include |
57 |
- $(SILENT)cp src/common/pony/detail/atomics.h $(destdir)/include/pony/detail |
58 |
- $(SILENT)cp -r packages $(destdir)/ |
59 |
- $(SILENT)cp -r .docs/* $(destdir)/docs-support/ |
60 |
+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyc.a $(destdir)/$(prefix)/$(libdir)/lib |
61 |
+ $(SILENT)cp $(PONY_BUILD_DIR)/ponyc $(destdir)/$(prefix)/$(libdir)/bin |
62 |
+ $(SILENT)cp src/libponyrt/pony.h $(destdir)/$(prefix)/$(libdir)/include |
63 |
+ $(SILENT)cp src/common/pony/detail/atomics.h $(destdir)/$(prefix)/$(libdir)/include/pony/detail |
64 |
+ $(SILENT)cp -r packages $(destdir)/$(prefix)/$(libdir)/ |
65 |
+ $(SILENT)cp -r .docs/* $(destdir)/$(prefix)/$(libdir)/docs-support/ |
66 |
ifeq ($$(symlink),yes) |
67 |
- @mkdir -p $(prefix)/bin |
68 |
- @mkdir -p $(prefix)/lib |
69 |
- @mkdir -p $(prefix)/include/pony/detail |
70 |
- $(SILENT)ln $(symlink.flags) $(destdir)/bin/ponyc $(prefix)/bin/ponyc |
71 |
- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyrt.a $(prefix)/lib/libponyrt.a |
72 |
+ @mkdir -p $(destdir)/$(prefix)/bin |
73 |
+ @mkdir -p $(destdir)/$(prefix)/lib |
74 |
+ @mkdir -p $(destdir)/$(prefix)/include/pony/detail |
75 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/bin/ponyc $(destdir)/$(prefix)/bin/ponyc |
76 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyrt.a $(destdir)/$(prefix)/lib/libponyrt.a |
77 |
ifeq ($(OSTYPE),linux) |
78 |
- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyrt-pic.a $(prefix)/lib/libponyrt-pic.a |
79 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyrt-pic.a $(destdir)/$(prefix)/lib/libponyrt-pic.a |
80 |
endif |
81 |
ifneq ($(wildcard $(destdir)/lib/libponyrt.bc),) |
82 |
- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyrt.bc $(prefix)/lib/libponyrt.bc |
83 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyrt.bc $(destdir)/$(prefix)/lib/libponyrt.bc |
84 |
endif |
85 |
ifneq ($(wildcard $(PONY_BUILD_DIR)/libdtrace_probes.a),) |
86 |
- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libdtrace_probes.a $(prefix)/lib/libdtrace_probes.a |
87 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libdtrace_probes.a $(destdir)/$(prefix)/lib/libdtrace_probes.a |
88 |
endif |
89 |
- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyc.a $(prefix)/lib/libponyc.a |
90 |
- $(SILENT)ln $(symlink.flags) $(destdir)/include/pony.h $(prefix)/include/pony.h |
91 |
- $(SILENT)ln $(symlink.flags) $(destdir)/include/pony/detail/atomics.h $(prefix)/include/pony/detail/atomics.h |
92 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyc.a $(destdir)/$(prefix)/lib/libponyc.a |
93 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/include/pony.h $(destdir)/$(prefix)/include/pony.h |
94 |
+ $(SILENT)ln $(symlink.flags) ../$(libdir)/include/pony/detail/atomics.h $(destdir)/$(prefix)/include/pony/detail/atomics.h |
95 |
endif |
96 |
endef |
97 |
|