diff options
| author | Chris Johns <chrisj@rtems.org> | 2019-08-29 13:28:51 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2019-08-29 13:28:51 +1000 |
| commit | 2051e6ef9fd02a03ffeb286a9f0315a0ec4ebfe7 (patch) | |
| tree | f845404a1f73d8a60b719aabea9733b739204a2a | |
| parent | sb/setbuilder: Check is mail is valid. (diff) | |
| download | rtems-source-builder-2051e6ef9fd02a03ffeb286a9f0315a0ec4ebfe7.tar.bz2 | |
sb/defaults: Add LDLIBS as some packages use this rather than LIBS.
| -rw-r--r-- | source-builder/defaults.mc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc index 13c34cb..9d5dd44 100644 --- a/source-builder/defaults.mc +++ b/source-builder/defaults.mc @@ -341,12 +341,14 @@ if test "%{_build}" != "%{_host}" ; then CFLAGS="${SB_HOST_CFLAGS}" CXXFLAGS="${SB_HOST_CXXFLAGS}" LDFLAGS="${SB_HOST_LDFLAGS}" + LDLIBS="${SB_HOST_LIBS}" LIBS="${SB_HOST_LIBS}" # Host CPPFLAGS_FOR_HOST="${SB_HOST_CPPFLAGS}" CFLAGS_FOR_HOST="${SB_HOST_CFLAGS}" CXXFLAGS_FOR_HOST="${SB_HOST_CXXFLAGS}" LDFLAGS_FOR_HOST="${SB_HOST_LDFLAGS}" + LDLIBS_FOR_HOST="${SB_HOST_LIBS}" LIBS_FOR_HOST="${SB_HOST_LIBS}" CXXFLAGS_FOR_HOST="${SB_HOST_CFLAGS}" CC_FOR_HOST=$(echo "%{_host_cc} ${SB_HOST_CFLAGS}" | sed -e 's,-std=gnu99 ,,') @@ -355,21 +357,23 @@ if test "%{_build}" != "%{_host}" ; then CFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}" CXXFLAGS_FOR_BUILD="${SB_BUILD_CXXFLAGS}" LDFLAGS_FOR_BUILD="${SB_BUILD_LDFLAGS}" + LDLIBS_FOR_BUILD="${SB_BUILD_LIBS}" LIBS_FOR_BUILD="${SB_BUILD_LIBS}" CXXFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}" CC_FOR_BUILD=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CXX_FOR_BUILD=$(echo "%{__cxx} ${SB_BUILD_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,') else LDFLAGS="${SB_BUILD_LDFLAGS}" + LDLIBS="${SB_BUILD_LIBS}" LIBS="${SB_BUILD_LIBS}" CC=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CXX=$(echo "%{__cxx} ${SB_BUILD_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,') CC_FOR_BUILD=${CC} CXX_FOR_BUILD=${CXX} fi -export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS LIBS -export CC_FOR_HOST CXX_FOR_HOST CPPFLAGS_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST LIBS_FOR_HOST -export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD LIBS_FOR_BUILS''' +export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS LIBS LDLIBS +export CC_FOR_HOST CXX_FOR_HOST CPPFLAGS_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST LDLIBS_FOR_HOST LIBS_FOR_HOST +export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD LDLIBS_FOR_BUILS LIBS_FOR_BUILS''' # Build/build flags. build_build_flags: none, none, ''' |