blob: 2dc8e918f4795a31fd3b34f474d839a93706e065 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
|
