Skip to content

Commit 07634ef

Browse files
committed
Do not forward (and forward incorrectly) Firebird build flags to tools (cloop)
1 parent d8fb127 commit 07634ef

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

builds/posix/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ifeq ($(CLIENT_ONLY_FLG),N)
197197
CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/btyacc
198198
endif
199199

200-
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" LD_FLAGS="$(WLDFLAGS)" $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop core
200+
CXX="$(CXX)" LD_FLAGS="$(PLATFORM_LDFLAGS)" $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop core
201201

202202
CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/decNumber
203203
ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(STATIC_LIB)

builds/posix/make.rules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ WCXXFLAGS = $(WFLAGS) $(PLUSPLUS_FLAGS) $(PLATFORM_PLUSPLUS_FLAGS) $(CXXFLAGS) $
7171
WLDFLAGS = $(LDFLAGS) $(AC_LDFLAGS)
7272

7373
ifneq ($(PLATFORM),DARWIN)
74-
WLDFLAGS += -static-libstdc++
74+
PLATFORM_LDFLAGS="-static-libstdc++"
75+
WLDFLAGS += $(PLATFORM_LDFLAGS)
7576
endif
7677

7778
# Here we have definitions for using the preprocessor.

0 commit comments

Comments
 (0)