blob: 270a28988f9d80986e16022dd3c53cd3186f94d8 (
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
|
From: Sam James <sam@gentoo.org>
Date: Fri, 29 Oct 2021 22:50:40 +0100
Subject: [PATCH] Respect *FLAGS
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,11 @@ GIT_HASH ?= $(shell [ -d .git ] && git rev-parse HEAD)
OS ?= $(shell uname -s)
-CPPFLAGS = -g -pthread -std=c++20 -fPIE \
- -DMOLD_VERSION=\"0.9.6\" \
- -DGIT_HASH=\"$(GIT_HASH)\" \
- $(EXTRA_CPPFLAGS)
+CFLAGS = -pthread -fPIE $(EXTRA_CFLAGS)
+CXXFLAGS = -pthread -std=c++20 -fPIE $(EXTRA_CXXFLAGS)
+CPPFLAGS = -DMOLD_VERSION=\"0.9.6\" \
+ -DGIT_HASH=\"$(GIT_HASH)\" \
+ $(EXTRA_CPPFLAGS)
LDFLAGS += $(EXTRA_LDFLAGS)
LIBS = -pthread -lz -lxxhash -ldl -lm
@@ -28,12 +29,6 @@ LTO ?= 0
ASAN ?= 0
TSAN ?= 0
-ifeq ($(DEBUG), 1)
- CPPFLAGS += -O0
-else
- CPPFLAGS += -O2
-endif
-
ifeq ($(LTO), 1)
CPPFLAGS += -flto -O3
LDFLAGS += -flto
@@ -73,11 +68,11 @@ endif
all: mold mold-wrapper.so
mold: $(OBJS) $(MIMALLOC_LIB) $(TBB_LIB)
- $(CXX) $(CXXFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
ln -sf mold ld
mold-wrapper.so: elf/mold-wrapper.c Makefile
- $(CC) -fPIC -shared -o $@ $< -ldl
+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $(LDFLAGS) $< -ldl
$(OBJS): $(HEADERS) Makefile
|
GitWeb
