mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	Remove AC_DEFINE for DEBUG/NDEBUG
Whoops, I momentarilly forgot I had explicitly set these as CC options so dependent packages which need to include spl_config.h would not end up having these defined which can result in accidentally hanging debug enabled at best, or a build failure at worst.
This commit is contained in:
		
							parent
							
								
									c950d1480d
								
							
						
					
					
						commit
						c2688979a4
					
				| @ -244,12 +244,10 @@ AC_DEFUN([SPL_AC_DEBUG], [ | |||||||
| 
 | 
 | ||||||
| 	AS_IF([test "x$enable_debug" = xyes], | 	AS_IF([test "x$enable_debug" = xyes], | ||||||
| 	[ | 	[ | ||||||
| 		AC_DEFINE([DEBUG], [1], [Define to 1 to enable debug]) |  | ||||||
| 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" | 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" | ||||||
| 		DEBUG_CFLAGS="-DDEBUG -Werror" | 		DEBUG_CFLAGS="-DDEBUG -Werror" | ||||||
| 	], | 	], | ||||||
| 	[ | 	[ | ||||||
| 		AC_DEFINE([NDEBUG], [1], [Define to 1 to enable debug]) |  | ||||||
| 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" | 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" | ||||||
| 		DEBUG_CFLAGS="-DNDEBUG" | 		DEBUG_CFLAGS="-DNDEBUG" | ||||||
| 	]) | 	]) | ||||||
|  | |||||||
							
								
								
									
										20
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @ -11630,21 +11630,11 @@ fi | |||||||
| 
 | 
 | ||||||
| 	if test "x$enable_debug" = xyes; then | 	if test "x$enable_debug" = xyes; then | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| cat >>confdefs.h <<\_ACEOF |  | ||||||
| #define DEBUG 1 |  | ||||||
| _ACEOF |  | ||||||
| 
 |  | ||||||
| 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" | 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" | ||||||
| 		DEBUG_CFLAGS="-DDEBUG -Werror" | 		DEBUG_CFLAGS="-DDEBUG -Werror" | ||||||
| 
 | 
 | ||||||
| else | else | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| cat >>confdefs.h <<\_ACEOF |  | ||||||
| #define NDEBUG 1 |  | ||||||
| _ACEOF |  | ||||||
| 
 |  | ||||||
| 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" | 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" | ||||||
| 		DEBUG_CFLAGS="-DNDEBUG" | 		DEBUG_CFLAGS="-DNDEBUG" | ||||||
| 
 | 
 | ||||||
| @ -15110,21 +15100,11 @@ fi | |||||||
| 
 | 
 | ||||||
| 	if test "x$enable_debug" = xyes; then | 	if test "x$enable_debug" = xyes; then | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| cat >>confdefs.h <<\_ACEOF |  | ||||||
| #define DEBUG 1 |  | ||||||
| _ACEOF |  | ||||||
| 
 |  | ||||||
| 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" | 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" | ||||||
| 		DEBUG_CFLAGS="-DDEBUG -Werror" | 		DEBUG_CFLAGS="-DDEBUG -Werror" | ||||||
| 
 | 
 | ||||||
| else | else | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| cat >>confdefs.h <<\_ACEOF |  | ||||||
| #define NDEBUG 1 |  | ||||||
| _ACEOF |  | ||||||
| 
 |  | ||||||
| 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" | 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" | ||||||
| 		DEBUG_CFLAGS="-DNDEBUG" | 		DEBUG_CFLAGS="-DNDEBUG" | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -3,9 +3,6 @@ | |||||||
| /* Atomic types use spinlocks */ | /* Atomic types use spinlocks */ | ||||||
| #undef ATOMIC_SPINLOCK | #undef ATOMIC_SPINLOCK | ||||||
| 
 | 
 | ||||||
| /* Define to 1 to enable debug */ |  | ||||||
| #undef DEBUG |  | ||||||
| 
 |  | ||||||
| /* Define to 1 to enable basic kmem accounting */ | /* Define to 1 to enable basic kmem accounting */ | ||||||
| #undef DEBUG_KMEM | #undef DEBUG_KMEM | ||||||
| 
 | 
 | ||||||
| @ -211,9 +208,6 @@ | |||||||
|    */ |    */ | ||||||
| #undef LT_OBJDIR | #undef LT_OBJDIR | ||||||
| 
 | 
 | ||||||
| /* Define to 1 to enable debug */ |  | ||||||
| #undef NDEBUG |  | ||||||
| 
 |  | ||||||
| /* get_zone_counts() is needed */ | /* get_zone_counts() is needed */ | ||||||
| #undef NEED_GET_ZONE_COUNTS | #undef NEED_GET_ZONE_COUNTS | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Brian Behlendorf
						Brian Behlendorf