diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 16:36:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 23:04:12 +0200 |
| commit | fc98a971350bed06e75443d89cef41d6bd346f7c (patch) | |
| tree | 668505274f9c5e596e173a513bd0aaab392cc97b | |
| parent | daabd72e077b3b0a80dcde98aea87fe9a7ff06e5 (diff) | |
Introduced --disable-linkoo.
| -rw-r--r-- | configure.in | 16 | ||||
| -rwxr-xr-x | set_soenv.in | 1 | ||||
| -rwxr-xr-x | smoketestoo_native/makefile.mk | 7 |
3 files changed, 23 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 603745290f77..df644ae09a05 100644 --- a/configure.in +++ b/configure.in @@ -257,6 +257,10 @@ AC_ARG_ENABLE(dbgutil, [Include additional debugging utilities, such as assertions, object counting, etc. Larger build. Independent from --enable-debug])) +AC_ARG_ENABLE(linkoo, + AS_HELP_STRING([--disable-linkoo], + [Disable linkoo for the smoketest installation.])) + AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable link-time optimization. Suitable for product builds. @@ -2336,6 +2340,18 @@ fi AC_SUBST(PRODUCT) AC_SUBST(PROEXT) +dnl Determine whether to use linkoo for the smoketest installation +dnl =================================================================== +AC_MSG_CHECKING([whether to use linkoo for the smoketest installation]) +if test "$enable_linkoo" = "no"; then + DISABLE_LINKOO="TRUE" + AC_MSG_RESULT([no]) +else + DISABLE_LINKOO= + AC_MSG_RESULT([yes]) +fi +AC_SUBST(DISABLE_LINKOO) + # Set the ENABLE_LTO variable # =================================================================== AC_MSG_CHECKING([whether to use link-time optimization]) diff --git a/set_soenv.in b/set_soenv.in index 310ac75120f1..dc2d996c2b5a 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1783,6 +1783,7 @@ ToFile( "WITH_STLPORT", "@WITH_STLPORT@", "e" ); ToFile( "ALLOC", "@ALLOC@", "e" ); ToFile( "ENABLE_LTO", "@ENABLE_LTO@", "e" ); ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" ); +ToFile( "DISABLE_LINKOO", "@DISABLE_LINKOO@", "e" ); ToFile( "DISABLE_STRIP", "@DISABLE_STRIP@", "e" ); ToFile( "LFS_CFLAGS", "@LFS_CFLAGS@", "e" ); ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" ); diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index e83f839fdbda..cd801847d3a6 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -57,9 +57,14 @@ TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) .IF "$(OS)" != "WNT" || "$(CROSS_COMPILING)" == "YES" +.IF "$(DISABLE_LINKOO)" == "TRUE" +my_linkoo = +.ELSE +my_linkoo = -l +.END localinstall : $(RM) -r $(installationtest_instpath) $(MKDIRHIER) $(installationtest_instpath) - ooinstall -l $(installationtest_instpath)/opt + ooinstall $(my_linkoo) $(installationtest_instpath)/opt cpptest : localinstall .END |