1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Respect CFLAGS;

Respect LDFLAGS so binaries find the correct libstdc++.so.6 (it picked
this library from lib/compat before this change).

Thanks gerald@.
This commit is contained in:
Dmitry Sivachenko 2014-07-24 12:02:32 +00:00
parent 523d91ca2f
commit 61a41b8a33
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362788

View File

@ -1,5 +1,20 @@
--- common/Makefile.machine.freebsd.orig Mon Oct 20 02:59:58 2003
+++ common/Makefile.machine.freebsd Sat Oct 23 11:12:06 2004
--- common/Makefile.machine.freebsd.orig 2006-01-05 23:25:59.000000000 +0300
+++ common/Makefile.machine.freebsd 2014-07-24 15:58:41.000000000 +0400
@@ -26,11 +26,11 @@
EXPORT_LDFLAGS = -s
# Shared compilation flags.
- CFLAGS = $(ADDITIONAL_CFLAGS) $(INCLUDES)
- CXXFLAGS = $(ADDITIONAL_CXXFLAGS) $(INCLUDES)
+ CFLAGS += $(ADDITIONAL_CFLAGS) $(INCLUDES)
+ CXXFLAGS += $(ADDITIONAL_CXXFLAGS) $(INCLUDES)
# Shared linking flags.
- LDFLAGS = $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR)
+ LDFLAGS += $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR)
# Other useful compilation flags.
ADDITIONAL_CFLAGS =
@@ -49,8 +49,8 @@
RLD_FLAG = -R