diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-25 00:23:31 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-01-17 17:31:50 +0100 |
| commit | 6a98980289ecc5b21a9c1044ca22e8de4f8f9c93 (patch) | |
| tree | 791bcad923bf247206d0db8c1d3b1e691bc03371 | |
| parent | 1518416ac6a692c2234dfa3cb4b98a382ebe65cc (diff) | |
lp#832121: libgcc_s magic breaks horribly on armel and powerpc
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 9 | ||||
| -rw-r--r-- | external/prj/d.lst | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 0b18d2c46b2d..ee1123bf70c8 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -6,6 +6,14 @@ TARGET=gcc3_specific .INCLUDE: settings.mk # ------------------------------------------------------------------ +.IF "$(CPU)" == "R" || "$(CPU)" == "P" +all: + echo "lp#832121: circumventing prelink magic on ppc and armel" + cp -p `gcc -print-file-name=libstdc++.so.$(SHORTSTDCPP3)` $(LB) + cp -p `gcc -print-file-name=libgcc_s.so.$(SHORTSTDC3)` $(LB) + cp -p `gcc -print-file-name=libgcc_s.so` $(LB) + +.ELSE .IF "$(BUILD_SPECIAL)"=="" @@ -83,6 +91,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF .ENDIF # "$(BUILD_SPECIAL)"=="" +.ENDIF .INCLUDE: target.mk diff --git a/external/prj/d.lst b/external/prj/d.lst index 7809c07a6264..0afa71fcb6b0 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -20,6 +20,7 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\lib\libgcc_s.so %_DEST%\lib%_EXT%\libgcc_s.so ..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.* ..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.* |