Author: lnicoara
Date: Wed Sep 19 00:03:48 2012
New Revision: 1387407
URL: http://svn.apache.org/viewvc?rev=1387407&view=rev
Log:
2012-09-18 Liviu Nicoara <lnico...@apache.org>
Reviewing revision 1385075 change:
* etc/config/src/gcc.config: (MULTI_CPPFLAGS_POSIX) Darwin builds
with stock gcc use the same -pthread flag; (MULTI_LDFLAGS_POSIX)
same; (LDLIBS) Darwin builds need to link the separate iconv
library
Modified:
stdcxx/branches/4.2.x/etc/config/gcc.config
Modified: stdcxx/branches/4.2.x/etc/config/gcc.config
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/gcc.config?rev=1387407&r1=1387406&r2=1387407&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/gcc.config (original)
+++ stdcxx/branches/4.2.x/etc/config/gcc.config Wed Sep 19 00:03:48 2012
@@ -264,11 +264,8 @@ ifeq ($(findstring CYGWIN,$(OSNAME)),)
MULTI_CPPFLAGS_POSIX = -D_REENTRANT
MULTI_LDFLAGS_POSIX = -lpthread
else
- # option doesn't exist in Darwin gcc
- ifneq ($(OSNAME),Darwin)
- MULTI_CPPFLAGS_POSIX = -pthread
- MULTI_LDFLAGS_POSIX = -pthread
- endif
+ MULTI_CPPFLAGS_POSIX = -pthread
+ MULTI_LDFLAGS_POSIX = -pthread
endif
endif
else
@@ -276,9 +273,6 @@ else
# -mthreads not defines _REENTRANT
MULTI_CPPFLAGS_POSIX = -D_REENTRANT -mthreads
MULTI_LDFLAGS_POSIX = -mthreads
-
- # link with libcatgets and libiconv
- LDLIBS += -lcatgets -liconv
endif
MULTI_CPPFLAGS_SOLARIS = -threads
@@ -294,6 +288,17 @@ MULTI_LDFLAGS = $(MULTI_LDFLAGS_POSIX)
SINGL_CPPFLAGS =
SINGL_LDFLAGS =
+# Other libraries
+ifneq ($(findstring CYGWIN,$(OSNAME)),)
+ # Cygwin: link with libcatgets and libiconv
+ LDLIBS += -lcatgets -liconv
+else
+ ifeq ($(OSNAME),Darwin)
+ # Darwin iconv library is outside libc
+ LDLIBS += -liconv
+ endif
+endif
+
# gcc can generate 32-bit or 64-bit code by default, depending
# on how it's configured
# determine whether the default compiler invocation produces
