]>
Commit | Line | Data |
---|---|---|
acde953e ER |
1 | Description: make cloop build honor compiler/linker flags from the environment |
2 | Author: Damyan Ivanov <dmn@debian.org> | |
3 | Forwarded: no | |
4 | ||
535fa407 BS |
5 | --- Firebird-3.0.5.33220-0/extern/cloop/Makefile.orig 2020-01-09 10:53:10.000000000 +0100 |
6 | +++ Firebird-3.0.5.33220-0/extern/cloop/Makefile 2020-01-13 12:47:47.869169239 +0100 | |
7 | @@ -6,7 +6,7 @@ | |
acde953e | 8 | |
535fa407 BS |
9 | CC := $(CC) |
10 | CXX := $(CXX) | |
acde953e ER |
11 | -LD := $(CXX) |
12 | +LD := $(CXX) $(LDFLAGS) | |
13 | ||
14 | SRC_DIR := src | |
15 | BUILD_DIR := build | |
535fa407 | 16 | @@ -27,8 +27,9 @@ |
acde953e ER |
17 | OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C)) |
18 | OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP)) | |
19 | ||
20 | -C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter | |
21 | -CXX_FLAGS := $(C_FLAGS) | |
22 | +COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter | |
23 | +C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS) | |
24 | +CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) | |
25 | FPC_FLAGS := -Mdelphi | |
26 | ||
27 | ifeq ($(TARGET),release) |