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 /icu | |
| 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 'icu')
| -rw-r--r-- | icu/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 872544cef5e5..b906d427fc79 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -148,6 +148,11 @@ icu_LDFLAGS+=-lgnustl_shared CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ ./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)' +.IF "$(OS)" == "MACOSX" +CONFIGURE_ACTION += \ + --prefix=/@.__________________________________________________$(EXTRPATH) +.END + CONFIGURE_FLAGS= # Use of @@ -191,7 +196,7 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicutu$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \ $(BUILD_DIR)$/lib$/libicutu$(DLLPOST) -OUT2BIN= \ +OUT2BIN_NONE= \ $(BUILD_DIR)$/bin$/genccode \ $(BUILD_DIR)$/bin$/genbrk \ $(BUILD_DIR)$/bin$/gencmn |