mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
32 lines
1.3 KiB
Plaintext
32 lines
1.3 KiB
Plaintext
$NetBSD: patch-aa,v 1.6 2013/08/22 13:15:04 ryoon Exp $
|
|
|
|
--- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000
|
|
+++ GNUmakefile
|
|
@@ -1,4 +1,4 @@
|
|
-CXXFLAGS = -DNDEBUG -g -O2
|
|
+CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2
|
|
# -O3 fails to link on Cygwin GCC version 4.5.3
|
|
# -fPIC is supported. Please report any breakage of -fPIC as a bug.
|
|
# CXXFLAGS += -fPIC
|
|
@@ -28,18 +28,16 @@ endif
|
|
|
|
ifeq ($(ISX86),1)
|
|
|
|
-GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])")
|
|
+GCC46_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[6-9]|[5-9])")
|
|
INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
|
|
ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])")
|
|
GAS210_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
|
|
GAS217_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
|
|
GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
|
|
|
|
-ifneq ($(GCC42_OR_LATER),0)
|
|
+ifneq ($(GCC46_OR_LATER),0)
|
|
ifeq ($(UNAME),Darwin)
|
|
CXXFLAGS += -arch x86_64 -arch i386
|
|
-else
|
|
-CXXFLAGS += -march=native
|
|
endif
|
|
endif
|
|
|