nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-10-30 05:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "autoconf: Allow overriding CFLAGS/CXXFLAGS from outside."

Browse Source 
This reverts commit 717e821b99. It's
much more convenient to do 'make OPTIMIZE=0'.
This commit is contained in:
Eelco Dolstra 2019-11-06 16:55:37 +01:00
parent 5ff4d77f55
commit f5b7991e59
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -17,6 +17,14 @@ makefiles = \
-include Makefile.config -include Makefile.config
OPTIMIZE = 1
ifeq ($(OPTIMIZE), 1)
GLOBAL_CXXFLAGS += -O3
else
GLOBAL_CXXFLAGS += -O0
endif
include mk/lib.mk include mk/lib.mk
GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17

6
configure.ac
View File

@ -50,10 +50,8 @@ AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier ('cpu-os')])
test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var
# Set default flags for nix (as per AC_PROG_CC/CXX docs), CFLAGS=
# while still allowing the user to override them from the command line. CXXFLAGS=
: ${CFLAGS="-O3"}
: ${CXXFLAGS="-O3"}
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CPP AC_PROG_CPP

7
perl/Makefile
View File

@ -4,4 +4,11 @@ GLOBAL_CXXFLAGS += -g -Wall
-include Makefile.config -include Makefile.config
OPTIMIZE = 1
ifeq ($(OPTIMIZE), 1)
GLOBAL_CFLAGS += -O3
GLOBAL_CXXFLAGS += -O3
endif
include mk/lib.mk include mk/lib.mk

6
perl/configure.ac
View File

@ -2,10 +2,8 @@ AC_INIT(nix-perl, m4_esyscmd([bash -c "echo -n $(cat ../.version)$VERSION_SUFFIX
AC_CONFIG_SRCDIR(MANIFEST) AC_CONFIG_SRCDIR(MANIFEST)
AC_CONFIG_AUX_DIR(../config) AC_CONFIG_AUX_DIR(../config)
# Set default flags for nix (as per AC_PROG_CC/CXX docs), CFLAGS=
# while still allowing the user to override them from the command line. CXXFLAGS=
: ${CFLAGS="-O3"}
: ${CXXFLAGS="-O3"}
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11 AX_CXX_COMPILE_STDCXX_11