Use -headerpad_max_install_names option for fractal demo under OS X.
Without it, changing install name fails which probably makes the demo unrunnable and also prevents the Buildbot build from succeeding. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@64986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -357,6 +357,8 @@ to run the tests, include CppUnit library here.
|
||||
<option name="SAMPLES_RPATH_FLAG"/>
|
||||
<option name="SAMPLES_RPATH_POSTLINK"/>
|
||||
|
||||
<option name="HEADER_PAD_OPTION"/>
|
||||
|
||||
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
|
||||
<set var="RUNTIME_LIBS">dynamic</set>
|
||||
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
|
||||
|
@@ -4442,6 +4442,8 @@ done
|
||||
\${inst_cmd} \${3}
|
||||
EOF
|
||||
chmod +x change-install-names
|
||||
|
||||
HEADER_PAD_OPTION="-headerpad_max_install_names"
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -8131,6 +8133,7 @@ AC_SUBST(TOOLKIT_LOWERCASE)
|
||||
AC_SUBST(TOOLKIT_VERSION)
|
||||
AC_SUBST(SAMPLES_RPATH_FLAG)
|
||||
AC_SUBST(SAMPLES_RPATH_POSTLINK)
|
||||
AC_SUBST(HEADER_PAD_OPTION)
|
||||
AC_SUBST(HOST_SUFFIX)
|
||||
AC_SUBST(CPPUNIT_CFLAGS)
|
||||
AC_SUBST(CPPUNIT_LIBS)
|
||||
|
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
HEADER_PAD_OPTION = @HEADER_PAD_OPTION@
|
||||
wx_top_builddir = @wx_top_builddir@
|
||||
|
||||
### Variables: ###
|
||||
@@ -156,7 +157,7 @@ distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
|
||||
$(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(HEADER_PAD_OPTION) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(__fractal___mac_rezcmd)
|
||||
$(__fractal___mac_setfilecmd)
|
||||
$(__fractal___os2_emxbindcmd)
|
||||
|
@@ -4,6 +4,7 @@
|
||||
<include file="../../build/bakefiles/common_samples.bkl"/>
|
||||
|
||||
<exe id="fractal" template="wx_sample" template_append="wx_append">
|
||||
<if cond="FORMAT=='autoconf'"><ldflags>$(HEADER_PAD_OPTION)</ldflags></if>
|
||||
<sources>
|
||||
fractal.cpp
|
||||
</sources>
|
||||
|
Reference in New Issue
Block a user