diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:34:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:46:38 +0100 |
| commit | 7c4f2ec8a795534164ee1923093b7d5be0126c55 (patch) | |
| tree | 08971f4c7375629393b6d9cdeb713006778334bf /stlport | |
| parent | 8c9823d311fdf8092cc75873e4565325d204a658 (diff) | |
Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc. This removes
the need for the special extshl and EXTRPATH=LOADER. Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 3e4a8deaec0f..b26de838877a 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -83,6 +83,8 @@ all: # stl/_epilog.h.) .ENDIF +EXTRPATH=URELIB + ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \ src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak @@ -90,6 +92,11 @@ ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$ CONFIGURE_ACTION=none CONFIGURE_FLAGS= +.IF "$(OS)" == "MACOSX" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) +.END + BUILD_DIR=src .IF "$(COM)"=="MSC" |