cmake: forward HOST_{C, LD}FLAGS as cmake flags

PATCH New Samuel Martin 2 participants 2 messages May 9, 2014

Share & tools

Samuel Martin

author

2014-05-09 09:07 UTC #0 lore raw

PATCH v2 1/1 cmake: forward HOST_{C, LD}FLAGS as cmake flags

During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap environment are not forwarded/converted as CMake flags.

The CMake build contains a bootstrap phase building a minimal CMake program using a standard Makfile, then reconfigures itself with this minimal program.

On system with no ncurses installed, and because the prefix option points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses, then ncurses libraries and headers are correctly found (in the host tree) during the second configuration (because of the prefix). However, it fails at building ccmake (the curses interface) because the CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not point to the host tree.

Because these flags are needed when running the bootstrap script, this patch makes sure the same flags are set when running the second configuration.

Reported-by Fabio Porcedda <[email protected]>

Signed-off-by Samuel Martin <[email protected]>

Cc Fabio Porcedda <[email protected]>

Cc Luca Ceresoli <[email protected]>

---
changes v1 -> v2:
- use HOST_CXXFLAGS (Fabio)
- cut lines at <=80 char. (Fabio)
- fix typo in commit log (Luca)

---
 package/cmake/cmake.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

package/cmake/cmake.mk +5 -1

index d45c642..235988b 100644
@@ -14,7 +14,11 @@ define HOST_CMAKE_CONFIGURE_CMDS
 	(cd $(@D); \
 		LDFLAGS="$(HOST_LDFLAGS)" \
 		CFLAGS="$(HOST_CFLAGS)" \
-		./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
+		./bootstrap --prefix=$(HOST_DIR)/usr \
+			--parallel=$(PARALLEL_JOBS) -- \
+			-DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \
+			-DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \
+			-DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
 	)
 endef

Signature · 1 line

1.9.2

Peter Korsgaard

2014-05-09 09:37 UTC #1 lore raw

PATCH v2 1/1 cmake: forward HOST_{C, LD}FLAGS as cmake flags

Quoted 26 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap environment are not forwarded/converted as CMake flags.
The CMake build contains a bootstrap phase building a minimal CMake program using a standard Makfile, then reconfigures itself with this minimal program.
On system with no ncurses installed, and because the prefix option points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses, then ncurses libraries and headers are correctly found (in the host tree) during the second configuration (because of the prefix). However, it fails at building ccmake (the curses interface) because the CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not point to the host tree.
Because these flags are needed when running the bootstrap script, this patch makes sure the same flags are set when running the second configuration.
Reported-by Fabio Porcedda <[email protected]>
Signed-off-by Samuel Martin <[email protected]>
Cc Fabio Porcedda <[email protected]>
Cc Luca Ceresoli <[email protected]>

Quoted 5 lines

---
changes v1 -> v2:
- use HOST_CXXFLAGS (Fabio)
- cut lines at <=80 char. (Fabio)
- fix typo in commit log (Luca)

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard