diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-08-30 11:39:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-08-30 11:39:00 +0000 |
| commit | 74c734184339a620b14e8d07ee708267f5e56237 (patch) | |
| tree | 5ce385d98d50261a345f9a70cf86a727828d3e71 /external/gcc3_specific | |
| parent | cb0ce63c076799a2e756f37046d658ce3fac13f2 (diff) | |
INTEGRATION: CWS ause064 (1.4.30); FILE MERGED
2006/08/14 12:37:15 hjs 1.4.30.2: #i68528# copy gcc libs happens too late for SO build
2006/08/11 10:07:36 hjs 1.4.30.1: #i68528# removed obsolete
Diffstat (limited to 'external/gcc3_specific')
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 193987be5fc3..e111d5c46138 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -7,31 +7,30 @@ TARGET=gcc3_specific # ------------------------------------------------------------------ +.IF "$(BUILD_SPECIAL)"=="" .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(OS)"!="MACOSX" .IF "$(OS)"!="IRIX" .IF "$(OS)"!="FREEBSD" +.EXPORT : CC -all .SEQUENTIAL : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so +all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1 -$(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) : - $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR) +$(LB)$/libstdc++.so.$(SHORTSTDCPP3) : + $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB) -$(SOLARLIBDIR)$/libgcc_s.so.1 : - $(GCCINSTLIB) libgcc_s.so.1 $(SOLARLIBDIR) - -$(SOLARLIBDIR)$/libgcc_s.so : $(SOLARLIBDIR)$/libgcc_s.so.1 - -rm -f $@ - +ln -s libgcc_s.so.1 $@ +$(LB)$/libgcc_s.so.1 : + $(GCCINSTLIB) libgcc_s.so.1 $(LB) .ENDIF .ENDIF .ENDIF .ENDIF +.ENDIF # "$(BUILD_SPECIAL)"=="" .INCLUDE: target.mk |