1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00

Missed these updates in r410093.

Pointy hat to:	myself
This commit is contained in:
Cy Schubert 2016-04-07 13:34:26 +00:00
parent b51caf89ca
commit 2d6420aa7a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=412665
2 changed files with 8 additions and 56 deletions

View File

@ -1,18 +1,6 @@
--- ../../src/dmd/posix.mak.orig 2016-01-27 07:22:54.000000000 -0800
+++ ../../src/dmd/posix.mak 2016-01-28 12:32:14.044394178 -0800
@@ -31,9 +31,9 @@
endif
#ifeq (osx,$(OS))
-# HOST_CC=clang++
+# HOST_CC=clanc++
#else
- HOST_CC=g++
+ HOST_CC=c++
#endif
CC=$(HOST_CC)
AR=ar
@@ -56,14 +56,11 @@
--- ../../src/dmd/posix.mak.orig 2016-04-05 20:46:46.000000000 -0700
+++ ../../src/dmd/posix.mak 2016-04-07 06:19:55.204336000 -0700
@@ -66,14 +66,11 @@
HOST_DMD_RUN:=$(HOST_DMD)
else
# Auto-bootstrapping, will download dmd automatically
@ -30,43 +18,7 @@
HOST_DMD_RUN=$(HOST_DMD) -conf=$(dir $(HOST_DMD))dmd.conf
endif
@@ -92,7 +89,7 @@
-Wno-unused-value \
-Wno-unused-variable
# GCC Specific
-ifeq ($(HOST_CC), g++)
+ifeq ($(HOST_CC), c++)
WARNINGS := $(WARNINGS) \
-Wno-logical-op \
-Wno-narrowing \
@@ -100,7 +97,7 @@
-Wno-uninitialized
endif
# Clang Specific
-ifeq ($(HOST_CC), clang++)
+ifeq ($(HOST_CC), clanc++)
WARNINGS := $(WARNINGS) \
-Wno-tautological-constant-out-of-range-compare \
-Wno-tautological-compare \
@@ -112,7 +109,7 @@
# Default Warnings
WARNINGS := -Wno-deprecated -Wstrict-aliasing
# Clang Specific
-ifeq ($(HOST_CC), clang++)
+ifeq ($(HOST_CC), clanc++)
WARNINGS := $(WARNINGS) \
-Wno-logical-op-parentheses \
-Wno-dynamic-class-memaccess \
@@ -130,7 +127,7 @@
-D__pascal= -DMARS=1 -DTARGET_$(OS_UPCASE)=1 -DDM_TARGET_CPU_$(TARGET_CPU)=1 \
$(MODEL_FLAG)
# GCC Specific
-ifeq ($(HOST_CC), g++)
+ifeq ($(HOST_CC), c++)
CFLAGS := $(CFLAGS) \
-std=gnu++98
endif
@@ -321,19 +318,6 @@
@@ -333,19 +330,6 @@
verstr.h SYSCONFDIR.imp core *.cov *.deps *.gcda *.gcno *.a *.lst
@[ ! -d ${PGO_DIR} ] || echo You should issue manually: rm -rf ${PGO_DIR}
@ -86,7 +38,7 @@
######## generate a default dmd.conf
define DEFAULT_DMD_CONF
@@ -440,7 +424,7 @@
@@ -452,7 +436,7 @@
$(eval bin_dir=$(if $(filter $(OS),osx), bin, bin$(MODEL)))
mkdir -p $(INSTALL_DIR)/$(OS)/$(bin_dir)
cp dmd $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd

View File

@ -39,6 +39,7 @@ include/d/druntime/import/core/exception.d
include/d/druntime/import/core/internal/abort.d
include/d/druntime/import/core/internal/convert.d
include/d/druntime/import/core/internal/hash.d
include/d/druntime/import/core/internal/spinlock.d
include/d/druntime/import/core/internal/string.d
include/d/druntime/import/core/internal/traits.d
include/d/druntime/import/core/math.d
@ -65,6 +66,8 @@ include/d/druntime/import/core/stdc/string.d
include/d/druntime/import/core/stdc/tgmath.d
include/d/druntime/import/core/stdc/time.d
include/d/druntime/import/core/stdc/wchar_.d
include/d/druntime/import/core/stdcpp/exception.d
include/d/druntime/import/core/stdcpp/typeinfo.d
include/d/druntime/import/core/stdc/wctype.d
include/d/druntime/import/core/sync/barrier.di
include/d/druntime/import/core/sync/condition.di
@ -463,7 +466,6 @@ include/d/phobos2/std/json.d
include/d/phobos2/std/math.d
include/d/phobos2/std/mathspecial.d
include/d/phobos2/std/meta.d
include/d/phobos2/std/metastrings.d
include/d/phobos2/std/mmfile.d
include/d/phobos2/std/net/curl.d
include/d/phobos2/std/net/isemail.d
@ -492,11 +494,9 @@ include/d/phobos2/std/stdio.d
include/d/phobos2/std/stdiobase.d
include/d/phobos2/std/stream.d
include/d/phobos2/std/string.d
include/d/phobos2/std/syserror.d
include/d/phobos2/std/system.d
include/d/phobos2/std/traits.d
include/d/phobos2/std/typecons.d
include/d/phobos2/std/typelist.d
include/d/phobos2/std/typetuple.d
include/d/phobos2/std/uni.d
include/d/phobos2/std/uri.d