hrev52236 adds 4 changesets to branch 'master'
old head: ee692b38b25ce08f1fe691523a63cacd28f9dfc4
new head: 8bc13c5528e2e15702c3d7628540094b5f3e1ad9
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=8bc13c5528e2+%5Eee692b38b25c
----------------------------------------------------------------------------
63cb44624949: docs/user: Remove extra comment opener.
It made the second one show up in the documentation.
252e4f6299d9: configure: Set a default LINKFLAGS in addition to LDFLAGS.
The former is passed to the compiler when linking using it,
the latter is passed to ld when it is invoked directly.
Also modify ArchitectureRules to not overwrite this setting.
b57e7df9ef1f: configure: Clean up BuildConfig generation and add HOST_CC.
We do a lot of checks against the CC specified in environment,
but we never pass it into the BuildConfig, so we have no guarantee
that's what Jam's actually using.
Additionally remove HAIKU_BOOT_BOARD while we're at it (nothing uses
it anymore), and reorder the sections in BuildConfig to make a little
more sense.
8bc13c5528e2: BuildSetup: Default HOST_C++ and HOST_LINK to HOST_CC.
Now that HOST_CC is actually passed in, we need to default
everything to it; otherwise, it's up to the Jambase as to
what CC we are actually using.
Found by trying to build Haiku on a system that has no "cc"
executable, but Jam tried to use it anyway (as all three of CC,
C++, and LINK.)
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 21 insertions(+), 23 deletions(-)
build/jam/ArchitectureRules | 2 +-
build/jam/BuildSetup | 4 ++--
configure | 35 +++++++++++++++++----------------
docs/user/storage/FindDirectory.dox | 3 ---
############################################################################
Commit: 63cb4462494984ceabf957eea8e1195981a006b1
URL: https://git.haiku-os.org/haiku/commit/?id=63cb44624949
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Aug 15 18:09:07 2018 UTC
docs/user: Remove extra comment opener.
It made the second one show up in the documentation.
----------------------------------------------------------------------------
diff --git a/docs/user/storage/FindDirectory.dox
b/docs/user/storage/FindDirectory.dox
index e1bad237ab..3f9c760b90 100644
--- a/docs/user/storage/FindDirectory.dox
+++ b/docs/user/storage/FindDirectory.dox
@@ -1200,9 +1200,6 @@
*/
-/*!
-
-
/*!
\fn status_t find_directory(directory_which which, dev_t volume,
bool createIt, char* pathString, int32 length)
############################################################################
Commit: 252e4f6299d9bb4a34693ba1527240b7a4d17f55
URL: https://git.haiku-os.org/haiku/commit/?id=252e4f6299d9
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Aug 15 18:19:30 2018 UTC
configure: Set a default LINKFLAGS in addition to LDFLAGS.
The former is passed to the compiler when linking using it,
the latter is passed to ld when it is invoked directly.
Also modify ArchitectureRules to not overwrite this setting.
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 96d7683a46..7df58798d5 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -70,10 +70,10 @@ rule ArchitectureSetup architecture
# initial state for flags etc.
HAIKU_C++_$(architecture) ?= $(HAIKU_CC_$(architecture)) ;
HAIKU_LINK_$(architecture) = $(HAIKU_CC_$(architecture)) ;
- HAIKU_LINKFLAGS_$(architecture) = $(ccBaseFlags) ;
HAIKU_CCFLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ;
HAIKU_C++FLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ;
+ HAIKU_LINKFLAGS_$(architecture) += $(ccBaseFlags) ;
HAIKU_ASFLAGS_$(architecture) += $(archFlags) -nostdinc ;
# strip is required
diff --git a/configure b/configure
index e32c96be65..a6750ca7bd 100755
--- a/configure
+++ b/configure
@@ -110,6 +110,8 @@ environment variables:
Defaults to "".
HAIKU_CXXFLAGS_<arch> The C++ flags for target architecture <arch>.
Defaults to "".
+ HAIKU_LINKFLAGS_<arch> The flags passed to the compiler when linking for
+ target architecture <arch>. Defaults to "".
HAIKU_LDFLAGS_<arch> The linker flags for target architecture <arch>.
Defaults to "".
HAIKU_ARFLAGS_<arch> The flags passed to HAIKU_AR for target
@@ -945,6 +947,7 @@ else
set_default_value HAIKU_CPPFLAGS_$targetArch ""
set_default_value HAIKU_CCFLAGS_$targetArch ""
set_default_value HAIKU_CXXFLAGS_$targetArch ""
+ set_default_value HAIKU_LINKFLAGS_$targetArch ""
set_default_value HAIKU_LDFLAGS_$targetArch ""
set_default_value HAIKU_ARFLAGS_$targetArch cru
set_default_value HAIKU_UNARFLAGS_$targetArch x
@@ -1053,6 +1056,7 @@ for targetArch in $HAIKU_PACKAGING_ARCHS; do
HAIKU_CPPFLAGS HAIKU_CPPFLAGS
HAIKU_CCFLAGS HAIKU_CCFLAGS
HAIKU_C++FLAGS HAIKU_CXXFLAGS
+ HAIKU_LINKFLAGS HAIKU_LINKFLAGS
HAIKU_LDFLAGS HAIKU_LDFLAGS
HAIKU_ARFLAGS HAIKU_ARFLAGS
HAIKU_UNARFLAGS HAIKU_UNARFLAGS
############################################################################
Commit: b57e7df9ef1fd2772939418d9762f912a1200b60
URL: https://git.haiku-os.org/haiku/commit/?id=b57e7df9ef1f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Aug 15 18:40:03 2018 UTC
configure: Clean up BuildConfig generation and add HOST_CC.
We do a lot of checks against the CC specified in environment,
but we never pass it into the BuildConfig, so we have no guarantee
that's what Jam's actually using.
Additionally remove HAIKU_BOOT_BOARD while we're at it (nothing uses
it anymore), and reorder the sections in BuildConfig to make a little
more sense.
----------------------------------------------------------------------------
diff --git a/configure b/configure
index a6750ca7bd..4de8e9f346 100755
--- a/configure
+++ b/configure
@@ -579,7 +579,6 @@ HOST_HAIKU_PORTER=
HAIKU_PORTS=
HAIKU_PORTS_CROSS=
HAIKU_IS_BOOTSTRAP=0
-HAIKU_BOOT_BOARD=
HAIKU_NO_DOWNLOADS=0
HAIKU_PACKAGING_ARCHS=
@@ -1001,33 +1000,31 @@ cat << EOF > "$buildConfigFile"
#e ${configureEnvirons}
#a ${configureArgs}
-TARGET_PLATFORM ?= "${TARGET_PLATFORM}" ;
HOST_PLATFORM ?= "${HOST_PLATFORM}" ;
-
-HAIKU_INCLUDE_SOURCES ?= "${HAIKU_INCLUDE_SOURCES}" ;
-HAIKU_INCLUDE_3RDPARTY ?= "${HAIKU_INCLUDE_3RDPARTY}" ;
-HAIKU_DISTRO_COMPATIBILITY ?=
"${HAIKU_DISTRO_COMPATIBILITY}" ;
-HAIKU_USE_GCC_PIPE ?=
"${HAIKU_USE_GCC_PIPE}" ;
-HAIKU_HOST_USE_32BIT ?= "${HAIKU_HOST_USE_32BIT}" ;
-HAIKU_HOST_USE_XATTR ?= "${HAIKU_HOST_USE_XATTR}" ;
-HAIKU_HOST_USE_XATTR_REF ?=
"${HAIKU_HOST_USE_XATTR_REF}" ;
-HAIKU_HOST_BUILD_ONLY ?= "${HAIKU_HOST_BUILD_ONLY}" ;
-
+TARGET_PLATFORM ?= "${TARGET_PLATFORM}" ;
HAIKU_PACKAGING_ARCHS ?= ${HAIKU_PACKAGING_ARCHS} ;
HAIKU_NO_DOWNLOADS ?= "${HAIKU_NO_DOWNLOADS}" ;
+HAIKU_INCLUDE_SOURCES ?= "${HAIKU_INCLUDE_SOURCES}" ;
+HAIKU_INCLUDE_3RDPARTY ?= "${HAIKU_INCLUDE_3RDPARTY}" ;
+HAIKU_DISTRO_COMPATIBILITY ?= "${HAIKU_DISTRO_COMPATIBILITY}" ;
-HAIKU_BUILD_ATTRIBUTES_DIR ?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
-
-HAIKU_NASM ?= ${HAIKU_NASM} ;
-HAIKU_BOOT_BOARD ?= ${HAIKU_BOOT_BOARD} ;
+HAIKU_USE_GCC_PIPE ?= "${HAIKU_USE_GCC_PIPE}" ;
+HAIKU_HOST_USE_32BIT ?= "${HAIKU_HOST_USE_32BIT}" ;
+HAIKU_HOST_USE_XATTR ?= "${HAIKU_HOST_USE_XATTR}" ;
+HAIKU_HOST_USE_XATTR_REF ?= "${HAIKU_HOST_USE_XATTR_REF}" ;
+HAIKU_HOST_BUILD_ONLY ?= "${HAIKU_HOST_BUILD_ONLY}" ;
-HOST_EXTENDED_REGEX_SED ?= ${HOST_EXTENDED_REGEX_SED} ;
+HOST_CC ?= ${CC} ;
HOST_GCC_RAW_VERSION ?= ${HOST_GCC_RAW_VERSION} ;
HOST_GCC_MACHINE ?= ${HOST_GCC_MACHINE} ;
HOST_LD ?= ${HOST_GCC_LD} ;
HOST_OBJCOPY ?= ${HOST_GCC_OBJCOPY} ;
+HOST_EXTENDED_REGEX_SED ?= ${HOST_EXTENDED_REGEX_SED} ;
HOST_SHA256 ?= ${HOST_SHA256} ;
+HAIKU_NASM ?= ${HAIKU_NASM} ;
+
+HAIKU_BUILD_ATTRIBUTES_DIR ?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
HOST_HAIKU_PORTER ?= ${HOST_HAIKU_PORTER} ;
HAIKU_PORTS ?= ${HAIKU_PORTS} ;
############################################################################
Revision: hrev52236
Commit: 8bc13c5528e2e15702c3d7628540094b5f3e1ad9
URL: https://git.haiku-os.org/haiku/commit/?id=8bc13c5528e2
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Aug 15 18:41:40 2018 UTC
BuildSetup: Default HOST_C++ and HOST_LINK to HOST_CC.
Now that HOST_CC is actually passed in, we need to default
everything to it; otherwise, it's up to the Jambase as to
what CC we are actually using.
Found by trying to build Haiku on a system that has no "cc"
executable, but Jam tried to use it anyway (as all three of CC,
C++, and LINK.)
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 4806ec6a33..550a230862 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -211,8 +211,8 @@ if $(HAIKU_HOST_USE_32BIT) = 1 {
# save jam's variables for the build platform
HOST_AR ?= $(AR) ;
HOST_CC ?= $(CC) ;
-HOST_C++ ?= $(C++) ;
-HOST_LINK ?= $(LINK) ;
+HOST_C++ ?= $(HOST_CC) ;
+HOST_LINK ?= $(HOST_CC) ;
HOST_RANLIB ?= $(RANLIB) ;
HOST_CPPFLAGS ?= $(CPPFLAGS) ;
HOST_CCFLAGS ?= $(HOST_GCC_BASE_FLAGS) $(CCFLAGS) ;
