diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-11-21 09:12:13 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-11-21 09:12:13 +0200 |
| commit | d6a1f58f40e108aac8f506f2e61e7306e771a576 (patch) | |
| tree | 2f8ced48d63eace146d625d8239be6b6e5344476 | |
| parent | 3804f7f85a483edc23e0f47217f143e3102abf26 (diff) | |
Don't use default make values for CC, CXX, AR, and RANLIB
6 files changed, 8 insertions, 8 deletions
diff --git a/libcutl/build/c/generic/configuration-dynamic.make b/libcutl/build/c/generic/configuration-dynamic.make index c8cf80a..319a86d 100644 --- a/libcutl/build/c/generic/configuration-dynamic.make +++ b/libcutl/build/c/generic/configuration-dynamic.make @@ -1,4 +1,4 @@ -ifneq ($(CC),) +ifeq ($(filter $(origin CC),undefined default),) c_generic := $(CC) else c_generic := gcc diff --git a/libcutl/build/cxx/generic/configuration-dynamic.make b/libcutl/build/cxx/generic/configuration-dynamic.make index d1672cf..c43865a 100644 --- a/libcutl/build/cxx/generic/configuration-dynamic.make +++ b/libcutl/build/cxx/generic/configuration-dynamic.make @@ -1,4 +1,4 @@ -ifneq ($(CXX),) +ifeq ($(filter $(origin CXX),undefined default),) cxx_generic := $(CXX) else cxx_generic := g++ diff --git a/libcutl/build/ld/configuration-lib-dynamic.make b/libcutl/build/ld/configuration-lib-dynamic.make index 74c8885..63d2ed3 100644 --- a/libcutl/build/ld/configuration-lib-dynamic.make +++ b/libcutl/build/ld/configuration-lib-dynamic.make @@ -1,12 +1,12 @@ ld_lib_type := archive -ifneq ($(AR),) +ifeq ($(filter $(origin AR),undefined default),) ld_lib_ar := $(AR) else ld_lib_ar := ar endif -ifneq ($(RANLIB),) +ifeq ($(filter $(origin RANLIB),undefined default),) ld_lib_ranlib := $(RANLIB) else ld_lib_ranlib := ranlib diff --git a/libxsd-frontend/build/cxx/generic/configuration-dynamic.make b/libxsd-frontend/build/cxx/generic/configuration-dynamic.make index d1672cf..c43865a 100644 --- a/libxsd-frontend/build/cxx/generic/configuration-dynamic.make +++ b/libxsd-frontend/build/cxx/generic/configuration-dynamic.make @@ -1,4 +1,4 @@ -ifneq ($(CXX),) +ifeq ($(filter $(origin CXX),undefined default),) cxx_generic := $(CXX) else cxx_generic := g++ diff --git a/libxsd-frontend/build/ld/configuration-lib-dynamic.make b/libxsd-frontend/build/ld/configuration-lib-dynamic.make index 74c8885..63d2ed3 100644 --- a/libxsd-frontend/build/ld/configuration-lib-dynamic.make +++ b/libxsd-frontend/build/ld/configuration-lib-dynamic.make @@ -1,12 +1,12 @@ ld_lib_type := archive -ifneq ($(AR),) +ifeq ($(filter $(origin AR),undefined default),) ld_lib_ar := $(AR) else ld_lib_ar := ar endif -ifneq ($(RANLIB),) +ifeq ($(filter $(origin RANLIB),undefined default),) ld_lib_ranlib := $(RANLIB) else ld_lib_ranlib := ranlib diff --git a/xsd/build/cxx/generic/configuration-dynamic.make b/xsd/build/cxx/generic/configuration-dynamic.make index d1672cf..c43865a 100644 --- a/xsd/build/cxx/generic/configuration-dynamic.make +++ b/xsd/build/cxx/generic/configuration-dynamic.make @@ -1,4 +1,4 @@ -ifneq ($(CXX),) +ifeq ($(filter $(origin CXX),undefined default),) cxx_generic := $(CXX) else cxx_generic := g++ |