diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
| commit | 074b6689e81d5bc4abf08d63dc8086b9cc41a078 (patch) | |
| tree | 8cff99d679b7260a54cebac38af0764b16394b71 /package/cdrkit/cdrkit.mk | |
| parent | 18abd4aa94cd59240b90257c95877c0ea2fd1796 (diff) | |
| parent | e7584697f24d0bc6fc660703d97a38598cb76690 (diff) | |
Merge branch 'fixes-20100729' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/cdrkit/cdrkit.mk')
| -rw-r--r-- | package/cdrkit/cdrkit.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk index f7e21b033..a0ce9cb56 100644 --- a/package/cdrkit/cdrkit.mk +++ b/package/cdrkit/cdrkit.mk @@ -11,15 +11,23 @@ else CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0 endif +# CMake doesn't support having the --sysroot option directly in the +# compiler path, so move this option to the CFLAGS/CXXFLAGS variables. +CDRKIT_TARGET_CC = $(filter-out --sysroot=%,$(TARGET_CC)) +CDRKIT_TARGET_CXX = $(filter-out --sysroot=%,$(TARGET_CXX)) +CDRKIT_TARGET_CFLAGS = $(filter --sysroot=%,$(TARGET_CC)) $(TARGET_CFLAGS) +CDRKIT_TARGET_CXXFLAGS = $(filter --sysroot=%,$(TARGET_CXX)) $(TARGET_CXXFLAGS) + define CDRKIT_CONFIGURE_CMDS -mkdir $(@D)/build (cd $(@D)/build ; \ $(HOST_DIR)/usr/bin/cmake .. \ -Wno-dev \ -DCMAKE_SYSTEM_NAME:STRING="Linux" \ - -DCMAKE_C_COMPILER:FILEPATH="$(TARGET_CC)" \ - -DCMAKE_CXX_COMPILER:FILEPATH="$(TARGET_CXX)" \ - -DCMAKE_C_FLAGS:STRING="$(TARGET_CFLAGS)" \ + -DCMAKE_C_COMPILER:FILEPATH="$(CDRKIT_TARGET_CC)" \ + -DCMAKE_CXX_COMPILER:FILEPATH="$(CDRKIT_TARGET_CXX)" \ + -DCMAKE_C_FLAGS:STRING="$(CDRKIT_TARGET_CFLAGS)" \ + -DCMAKE_CXX_FLAGS:STRING="$(CDRKIT_TARGET_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ |