incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1180532 - in /incubator/ooo/trunk/main: external/gcc3_specific/makefile.mk scp2/source/ooo/ure.scp
Date Sun, 09 Oct 2011 02:59:36 GMT
Author: pfg
Date: Sun Oct  9 02:59:36 2011
New Revision: 1180532

URL: http://svn.apache.org/viewvc?rev=1180532&view=rev
Log:
i85027  - FreeBSD port: include libgcc_s and libstdc++ in the installation set.

Modified:
    incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/ure.scp

Modified: incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk?rev=1180532&r1=1180531&r2=1180532&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk (original)
+++ incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk Sun Oct  9 02:59:36 2011
@@ -43,7 +43,6 @@ $(MINGWGXXDLL) :
 .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
 
 .IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="FREEBSD"
 
 .EXPORT : CC
 
@@ -60,8 +59,6 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
 .ENDIF 
 
 .ENDIF
-
-.ENDIF
 .ENDIF			# "$(BUILD_SPECIAL)"==""
 
 

Modified: incubator/ooo/trunk/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/ure.scp?rev=1180532&r1=1180531&r2=1180532&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/ure.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/ure.scp Sun Oct  9 02:59:36 2011
@@ -855,7 +855,7 @@ File gid_File_Dl_Stlport
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined NETBSD \
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
@@ -866,7 +866,7 @@ File gid_File_Dl_GccS
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined NETBSD \
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
 File gid_File_Dl_Stdcpp
     Dir = SCP2_URE_DL_DIR;



Mime
View raw message