diff --git a/asmrun/Makefile b/asmrun/Makefile index f275e2a0a..6b4cf120b 100644 --- a/asmrun/Makefile +++ b/asmrun/Makefile @@ -50,7 +50,7 @@ endif ifeq "$(TOOLCHAIN)" "msvc" DFLAGS = $(CFLAGS) -DDEBUG -PFLAGS=$(CFLAGS) -DPROFILING $(NATIVECCPROFOPTS) +PFLAGS=$(CFLAGS) -DPROFILING ASMOBJS=$(ARCH)nt.$(O) ASMFLAGS= ifeq ($(WITH_SPACETIME),true) @@ -58,7 +58,7 @@ ASMFLAGS=/DWITH_SPACETIME endif else DFLAGS = $(CFLAGS) -g -DDEBUG -PFLAGS=$(CFLAGS) -pg -DPROFILING $(NATIVECCPROFOPTS) +PFLAGS=$(CFLAGS) -pg -DPROFILING ASMOBJS=$(ARCH).$(O) endif diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 1ac1d8acd..7889cd66b 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -77,7 +77,6 @@ RPATH= SUPPORTS_SHARED_LIBRARIES=true SHAREDCCCOMPOPTS= MKSHAREDLIBRPATH= -NATIVECCPROFOPTS= ASM=$(TOOLPREF)as ASPP=$(TOOLPREF)gcc -c ASPPPROFFLAGS= diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64 index f6076c3c9..0aa5bb30c 100644 --- a/config/Makefile.mingw64 +++ b/config/Makefile.mingw64 @@ -77,7 +77,6 @@ RPATH= SUPPORTS_SHARED_LIBRARIES=true SHAREDCCCOMPOPTS= MKSHAREDLIBRPATH= -NATIVECCPROFOPTS= ASM=$(TOOLPREF)as ASPP=$(TOOLPREF)gcc -c ASPPPROFFLAGS= diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 64d5a7c54..8decdf1c9 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -70,7 +70,6 @@ X11_LINK= RPATH= SUPPORTS_SHARED_LIBRARIES=true SHAREDCCCOMPOPTS= -NATIVECCPROFOPTS= ASM=ml -nologo -coff -Cp -c -Fo ASPP= ASPPPROFFLAGS= diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64 index c16f5598e..5dbd71b6c 100644 --- a/config/Makefile.msvc64 +++ b/config/Makefile.msvc64 @@ -70,7 +70,6 @@ X11_LINK= RPATH= SUPPORTS_SHARED_LIBRARIES=true SHAREDCCCOMPOPTS= -NATIVECCPROFOPTS= ASM=ml64 -nologo -Cp -c -Fo ASPP= ASPPPROFFLAGS= diff --git a/configure b/configure index d607a2b07..a04dd53fc 100755 --- a/configure +++ b/configure @@ -1034,8 +1034,6 @@ case "$native_compiler" in arch=none; model=default; system=unknown; natdynlink=false;; esac -nativeccprofopts='' - case "$arch,$cc,$system,$model" in *,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; @@ -2112,7 +2110,6 @@ config MODEL "$model" config SYSTEM "$system" config OCAMLOPT_CFLAGS "$common_cflags" config OCAMLOPT_CPPFLAGS "$common_cppflags" -config NATIVECCPROFOPTS "$nativeccprofopts" config NATIVECCLIBS "$cclibs $dllib" config ASM "$as" config ASPP "$aspp"