openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1811604 - /openoffice/trunk/main/nss/nss.patch
Date Mon, 09 Oct 2017 20:59:12 GMT
Author: jim
Date: Mon Oct  9 20:59:12 2017
New Revision: 1811604

URL: http://svn.apache.org/viewvc?rev=1811604&view=rev
Log:
Force lib again

Modified:
    openoffice/trunk/main/nss/nss.patch

Modified: openoffice/trunk/main/nss/nss.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss.patch?rev=1811604&r1=1811603&r2=1811604&view=diff
==============================================================================
--- openoffice/trunk/main/nss/nss.patch (original)
+++ openoffice/trunk/main/nss/nss.patch Mon Oct  9 20:59:12 2017
@@ -116,7 +116,7 @@ diff -ur misc/nss-3.25/nss/coreconf/Darw
 +
 +# CC is taken from environment automatically.
 +#CC		= cc
-+CCC		= $(CXX) -stdlib=libc++
++CCC		= $(CXX) -stdlib=libc++ -std=c++11
  
 -CC		= gcc
 -CCC		= g++
@@ -282,7 +282,7 @@ diff -ur misc/nss-3.25/nss/external_test
  else
 -    CXXFLAGS += -std=c++0x
 +    ifeq (Darwin,$(OS_ARCH))
-+        CXXFLAGS += -stdlib=libc++
++        CXXFLAGS += -stdlib=libc++ -std=c++11
 +    else
 +        CXXFLAGS += -std=c++0x
 +    endif



Mime
View raw message