From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Apr 2016 12:37:33 +0000 (-0400)
Subject: cmake: pass RULE_LAUNCHER_* to cythonReviewed-by: Josh Durgin <jdurgin@redhat.com>
X-Git-Tag: ses3-milestone4~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae2ffc14f09555a9fc64737bd1bf6732d1b552a2;p=ceph.git

cmake: pass RULE_LAUNCHER_* to cythonReviewed-by: Josh Durgin <jdurgin@redhat.com>

cmake: pass RULE_LAUNCHER_* to cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
---

ae2ffc14f09555a9fc64737bd1bf6732d1b552a2
diff --cc src/pybind/cephfs/CMakeLists.txt
index 61c469823c2f,b3f4cf44dc37..21fcdb55d4b0
--- a/src/pybind/cephfs/CMakeLists.txt
+++ b/src/pybind/cephfs/CMakeLists.txt
@@@ -1,8 -1,12 +1,12 @@@
  add_custom_target(cython_cephfs
    COMMAND
+   env
+   CC=${PY_CC}
+   CXX=${PY_CXX}
+   LDSHARED=${PY_LDSHARED}
    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
    CYTHON_BUILD_DIR=${CMAKE_BINARY_DIR}/src/pybind/cephfs
 -  CFLAGS=\"-I${CMAKE_SOURCE_DIR}/src -I${CMAKE_BINARY_DIR}/include -I${CMAKE_SOURCE_DIR}/src/include -std=c++11\"
 +  CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
    python ${CMAKE_SOURCE_DIR}/src/pybind/cephfs/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose 
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/cephfs
    DEPENDS rados cephfs)
diff --cc src/pybind/rados/CMakeLists.txt
index 750c8cacafc0,007ff709555b..efec92b1d810
--- a/src/pybind/rados/CMakeLists.txt
+++ b/src/pybind/rados/CMakeLists.txt
@@@ -1,8 -1,12 +1,12 @@@
  add_custom_target(cython_rados
    COMMAND
+   env
+   CC=${PY_CC}
+   CXX=${PY_CXX}
+   LDSHARED=${PY_LDSHARED}
    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
    CYTHON_BUILD_DIR=${CMAKE_BINARY_DIR}/src/pybind/rados
 -  CFLAGS=\"-I${CMAKE_SOURCE_DIR}/src/include -std=c++11\"
 +  CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
    python ${CMAKE_SOURCE_DIR}/src/pybind/rados/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose 
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/rados
    DEPENDS rados)
diff --cc src/pybind/rbd/CMakeLists.txt
index 84cecd8e1de4,6afc639333dd..3757911194c4
--- a/src/pybind/rbd/CMakeLists.txt
+++ b/src/pybind/rbd/CMakeLists.txt
@@@ -1,8 -1,12 +1,12 @@@
  add_custom_target(cython_rbd
    COMMAND
+   env
+   CC=${PY_CC}
+   CXX=${PY_CXX}
+   LDSHARED=${PY_LDSHARED}
    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
    CYTHON_BUILD_DIR=${CMAKE_BINARY_DIR}/src/pybind/rbd
 -  CFLAGS=\"-I${CMAKE_SOURCE_DIR}/src/include -std=c++11\"
 +  CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
    python ${CMAKE_SOURCE_DIR}/src/pybind/rbd/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/rbd
    DEPENDS rbd)