diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-10-06 16:38:16 +0200 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-10-06 16:38:16 +0200 |
| commit | 4d2ac8fbe461a9b09c152f27cd4c8d22410c487d (patch) | |
| tree | 63d53662aedd3ce7bd60fccf25cb3d05f3463dba | |
| parent | 3ddc5c9e3777fff5c17f74902bb5ddc7cdaf1eb1 (diff) | |
| parent | 485ec6be86497fe2ec1949f62c33bff7b7a9bec2 (diff) | |
Merge pull request #135 from alanevans/master
Use specified php-config for linker/compiler flags rather than the system default. Fixes CopernicaMarketingSoftware/PHP-CPP#134
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -91,7 +91,7 @@ ARCHIVER = ar rcs COMPILER_FLAGS = -Wall -c -g -std=c++11 SHARED_COMPILER_FLAGS = -fpic STATIC_COMPILER_FLAGS = -PHP_COMPILER_FLAGS = ${COMPILER_FLAGS} `php-config --includes` +PHP_COMPILER_FLAGS = ${COMPILER_FLAGS} `${PHP_CONFIG} --includes` HHVM_COMPILER_FLAGS = ${COMPILER_FLAGS} # @@ -105,7 +105,7 @@ HHVM_COMPILER_FLAGS = ${COMPILER_FLAGS} # LINKER_FLAGS = -shared -PHP_LINKER_FLAGS = ${LINKER_FLAGS} `php-config --ldflags` +PHP_LINKER_FLAGS = ${LINKER_FLAGS} `${PHP_CONFIG} --ldflags` HHVM_LINKER_FLAGS = ${LINKER_FLAGS} |