Ticket #9379: Make-arch.patch

File Make-arch.patch, 12.0 KB (added by vbraun, 10 years ago)

Patch to Make.arch that removed CC, AR, RANLIB overrides

  • Make-arch

    old new  
    5353        @echo "   solaris-ultra-thr - Sun Solaris 9/10 UI/Sun Threads, US-1/2"
    5454        @echo "  solaris-ultra3-thr - Sun Solaris 9/10 UI/Sun Threads, US-III"
    5555        @echo "      solaris-64-thr - Sun Solaris 9/10 UI/Sun Threads, 64-bit"
     56        @echo "solaris-pthreads-gcc-64-bit - 64-bit (should work on SPARC or x64)"
    5657        @echo ""
    5758        @echo "--------------------------------------------------------------"
    5859        @echo "              Sequential Versions                             "
     
    289290tru64-alpha:
    290291        $(MAKE) all \
    291292        "ARCH = tru64-alpha" \
    292         "CC = cc" \
    293293        "CFLAGS = -std1 -fast -O4 -arch host -tune host -w0 -verbose $(MISCFLAGS) -DLP64" \
    294         "AR = ar" \
    295294        "ARFLAGS = r" \
    296295        "STRIP = strip" \
    297296        "LIBS = -non_shared -om -L. -ltachyon $(MISCLIB) -lm"
     
    302301tru64-alpha-thr:
    303302        $(MAKE) all \
    304303        "ARCH = tru64-alpha-thr" \
    305         "CC = cc" \
    306304        "CFLAGS = -speculate all -std1 -pthread -fast -O4 -arch host -tune host -verbose $(MISCFLAGS) -DTHR -DLP64" \
    307         "AR = ar" \
    308305        "ARFLAGS = r" \
    309306        "STRIP = strip" \
    310307        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
     
    312309tru64-alpha-thr-ogl:
    313310        $(MAKE) all \
    314311        "ARCH = tru64-alpha-thr-ogl" \
    315         "CC = cc" \
    316312        "CFLAGS = -speculate all -std1 -pthread -fast -O4 -arch host -tune host -verbose $(MISCFLAGS) -DTHR -DUSEOPENGL -DLP64" \
    317         "AR = ar" \
    318313        "ARFLAGS = r" \
    319314        "STRIP = strip" \
    320315        "LIBS = -L. -ltachyon $(TRU64_GLX_LIBS) $(MISCLIB) -lm"
     
    466461solaris-pthreads-gcc:
    467462        $(MAKE) all \
    468463        "ARCH = solaris-pthreads-gcc" \
    469         "CC = gcc" \
    470464        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -D_REENTRANT -DSunOS $(MISCFLAGS) -DTHR -DUSEPOSIXTHREADS" \
    471         "AR = ar" \
     465        "ARFLAGS = r" \
     466        "STRIP = strip" \
     467        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
     468
     469solaris-pthreads-gcc-64-bit:
     470        $(MAKE) all \
     471        "ARCH = solaris-pthreads-gcc" \
     472        "CFLAGS = -Wall -O4 -m64 -fomit-frame-pointer -ffast-math -D_REENTRANT -DSunOS $(MISCFLAGS) -DTHR -DUSEPOSIXTHREADS" \
    472473        "ARFLAGS = r" \
    473474        "STRIP = strip" \
    474475        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
     
    636637solaris-gcc-thr:
    637638        $(MAKE) all \
    638639        "ARCH = solaris-gcc-thr" \
    639         "CC = gcc" \
    640640        "CFLAGS = -ansi -Wall -pedantic -O4 -mv8 -msupersparc -DSunOS $(MISCFLAGS) -DTHR -D_REENTRANT" \
    641         "AR = ar" \
    642641        "ARFLAGS = r" \
    643642        "STRIP = touch" \
    644643        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lsocket -lthread"
     
    646645solaris-gcc-thr-x11:
    647646        $(MAKE) all \
    648647        "ARCH = solaris-gcc-thr-x11" \
    649         "CC = gcc" \
    650648        "CFLAGS = -ansi -Wall -pedantic -O4 -mv8 -msupersparc $(X11INC) -DSunOS $(MISCFLAGS) -DTHR -D_REENTRANT -DUSEX11" \
    651         "AR = ar" \
    652649        "ARFLAGS = r" \
    653650        "STRIP = touch" \
    654651        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lsocket $(X11LIB) -lthread"
     
    850847next:
    851848        $(MAKE) all \
    852849        "ARCH = next" \
    853         "CC = cc" \
    854850        "CFLAGS = -O -DNEXT $(MISCFLAGS)" \
    855         "AR = ar" \
    856851        "ARFLAGS = r" \
    857852        "STRIP = strip" \
    858         "RANLIB = ranlib" \
    859853        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    860854
    861855macosx:
    862856        $(MAKE) all \
    863857        "ARCH = macosx" \
    864         "CC = cc" \
    865858        "CFLAGS = -Os -ffast-math -DBsd $(MISCFLAGS)" \
    866         "AR = ar" \
    867859        "ARFLAGS = r" \
    868860        "STRIP = strip" \
    869         "RANLIB = ranlib" \
     861        "LIBS = -L. -ltachyon $(MISCLIB)"
     862
     863macosx-64:
     864        $(MAKE) all \
     865        "ARCH = macosx" \
     866        "CFLAGS = -Os -m64 -ffast-math -DBsd $(MISCFLAGS)" \
     867        "ARFLAGS = r" \
     868        "STRIP = strip" \
    870869        "LIBS = -L. -ltachyon $(MISCLIB)"
    871870
    872871macosx-thr:
    873872        $(MAKE) all \
    874873        "ARCH = macosx-thr" \
    875         "CC = cc" \
    876874        "CFLAGS = -Os -ffast-math -DTHR $(MISCFLAGS)" \
    877         "AR = ar" \
    878875        "ARFLAGS = r" \
    879876        "STRIP = strip" \
    880         "RANLIB = ranlib" \
    881877        "LIBS = -L. -ltachyon $(MISCLIB) -lpthread"
    882878
    883879#"CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \
     
    886882macosx-altivec:
    887883        $(MAKE) all \
    888884        "ARCH = macosx-altivec" \
    889         "CC = cc" \
    890885        "CFLAGS = -Os -mcpu=750 -faltivec -force_cpusubtype_ALL -fomit-frame-pointer -ffast-math -DBsd $(MISCFLAGS)" \
    891         "AR = ar" \
    892886        "ARFLAGS = r" \
    893887        "STRIP = strip" \
    894         "RANLIB = ranlib" \
    895888        "LIBS = -L. -ltachyon $(MISCLIB)"
    896889
    897890macosx-x86-thr:
    898891        $(MAKE) all \
    899892        "ARCH = macosx-x86-thr" \
    900         "CC = cc" \
    901893        "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \
    902         "AR = ar" \
    903894        "ARFLAGS = r" \
    904895        "STRIP = strip" \
    905         "RANLIB = ranlib" \
    906896        "LIBS = -L. -ltachyon $(MISCLIB) -lpthread -framework Carbon"
    907897
    908898
     
    913903beos:
    914904        $(MAKE) all \
    915905        "ARCH = beos" \
    916         "CC = gcc" \
    917906        "CFLAGS = -O6 -fomit-frame-pointer -ffast-math $(MISCFLAGS)" \
    918         "AR = ar" \
    919907        "ARFLAGS = r" \
    920908        "STRIP = strip" \
    921         "RANLIB = ranlib" \
    922909        "LIBS = -L. -ltachyon $(MISCLIB)"
    923910
    924911##
     
    929916bsd:
    930917        $(MAKE) all \
    931918        "ARCH = bsd" \
    932         "CC = gcc" \
    933919        "CFLAGS = -O6 -fomit-frame-pointer -ffast-math -DBsd  $(MISCFLAGS)" \
    934         "AR = ar" \
    935920        "ARFLAGS = r" \
    936921        "STRIP = strip" \
    937         "RANLIB = ranlib" \
    938922        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    939923
    940924bsd-sparc:
    941925        $(MAKE) all \
    942926        "ARCH = bsd-sparc" \
    943         "CC = gcc" \
    944927        "CFLAGS = -mv8 -msupersparc -O6 -fomit-frame-pointer -ffast-math -DBsd  $(MISCFLAGS)" \
    945         "AR = ar" \
    946928        "ARFLAGS = r" \
    947929        "STRIP = strip" \
    948         "RANLIB = ranlib" \
    949930        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    950931
    951932##
     
    955936win32:
    956937        $(MAKE) all \
    957938        "ARCH = win32" \
    958         "CC = gcc" \
    959         "CFLAGS = -mpentium -Wall -O6 -fomit-frame-pointer -ffast-math -DWIN32 $(MISCFLAGS)" \
    960         "AR = ar" \
     939        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DWIN32 $(MISCFLAGS)" \
    961940        "ARFLAGS = r" \
    962941        "STRIP = echo" \
    963         "RANLIB = echo" \
    964942        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    965943
    966944win32-mpi:
    967945        $(MAKE) all \
    968946        "ARCH = win32-mpi" \
    969         "CC = gcc" \
    970         "CFLAGS = -mpentium -Wall -O6 -fomit-frame-pointer -ffast-math -DWIN32 $(MISCFLAGS) -I'/Program files/MPIPro/INCLUDE' -DMPI" \
    971         "AR = ar" \
     947        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DWIN32 $(MISCFLAGS) -I'/Program files/MPIPro/INCLUDE' -DMPI" \
    972948        "ARFLAGS = r" \
    973949        "STRIP = echo" \
    974         "RANLIB = echo" \
    975950        "LIBS = -L. -L'/Program files/MPIPro/LIB' -ltachyon -lmpi $(MISCLIB) -lm"
    976951
    977952##
     
    982957linux:
    983958        $(MAKE) all \
    984959        "ARCH = linux" \
    985         "CC = gcc" \
    986960        "CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
    987         "AR = ar" \
    988961        "ARFLAGS = r" \
    989962        "STRIP = strip" \
    990         "RANLIB = ranlib" \
    991963        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    992964
    993965# Linux on x86, using gcc
    994966linux-debug:
    995967        $(MAKE) all \
    996968        "ARCH = linux-debug" \
    997         "CC = gcc" \
    998969        "CFLAGS = -m32 -Wall -g -DLinux $(MISCFLAGS)" \
    999         "AR = ar" \
    1000970        "ARFLAGS = r" \
    1001971        "STRIP = touch" \
    1002         "RANLIB = ranlib" \
    1003972        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    1004973
    1005974# Linux on AMD64/EM64T, using gcc
    1006975linux-64:
    1007976        $(MAKE) all \
    1008977        "ARCH = linux-64" \
    1009         "CC = gcc" \
    1010978        "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
    1011         "AR = ar" \
    1012979        "ARFLAGS = r" \
    1013980        "STRIP = strip" \
    1014         "RANLIB = ranlib" \
    1015981        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    1016982
    1017983# Linux on AMD64/EM64T, using gcc
    1018984linux-64-debug:
    1019985        $(MAKE) all \
    1020986        "ARCH = linux-64-debug" \
    1021         "CC = gcc" \
    1022987        "CFLAGS = -m64 -Wall -O -g -DLinux -DLP64 $(MISCFLAGS)" \
    1023         "AR = ar" \
    1024988        "ARFLAGS = r" \
    1025989        "STRIP = touch" \
    1026         "RANLIB = ranlib" \
    1027990        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    1028991
    1029992
     
    1031994linux-64-thr:
    1032995        $(MAKE) all \
    1033996        "ARCH = linux-64-thr" \
    1034         "CC = gcc" \
    1035997        "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
    1036         "AR = ar" \
    1037998        "ARFLAGS = r" \
    1038999        "STRIP = strip" \
    1039         "RANLIB = ranlib" \
    10401000        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
    10411001
    10421002
     
    10441004linux-p4:
    10451005        $(MAKE) all \
    10461006        "ARCH = linux-p4" \
    1047         "CC = gcc" \
    10481007        "CFLAGS = -mcpu=i686 -march=i686 -funroll-loops -fexpensive-optimizations -malign-double -fschedule-insns2 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
    1049         "AR = ar" \
    10501008        "ARFLAGS = r" \
    10511009        "STRIP = strip" \
    1052         "RANLIB = ranlib" \
    10531010        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    10541011
    10551012# Linux x86, on Intel P4 using Intel C 8.0
     
    10821039linux-athlon:
    10831040        $(MAKE) all \
    10841041        "ARCH = linux-athlon" \
    1085         "CC = gcc" \
    10861042        "CFLAGS = -mcpu=athlon -march=athlon -funroll-loops -fexpensive-optimizations -malign-double -fschedule-insns2 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
    1087         "AR = ar" \
    10881043        "ARFLAGS = r" \
    10891044        "STRIP = strip" \
    1090         "RANLIB = ranlib" \
    10911045        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    10921046
    10931047linux-athlon-thr:
    10941048        $(MAKE) all \
    10951049        "ARCH = linux-athlon-thr" \
    1096         "CC = gcc" \
    10971050        "CFLAGS = -mcpu=athlon -march=athlon -funroll-loops -fexpensive-optimizations -malign-double -fschedule-insns2 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
    1098         "AR = ar" \
    10991051        "ARFLAGS = r" \
    11001052        "STRIP = strip" \
    1101         "RANLIB = ranlib" \
    11021053        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
    11031054
    11041055
     
    11301081linux-thr:
    11311082        $(MAKE) all \
    11321083        "ARCH = linux-thr" \
    1133         "CC = gcc" \
    1134         "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
    1135         "AR = ar" \
     1084        "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) $(GCCFIX)" \
    11361085        "ARFLAGS = r" \
    11371086        "STRIP = strip" \
    1138         "RANLIB = ranlib" \
    11391087        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
    11401088
    11411089# Linux x86 using gcc, threads, and OpenGL
    11421090linux-thr-ogl:
    11431091        $(MAKE) all \
    11441092        "ARCH = linux-thr-ogl" \
    1145         "CC = cc" \
    11461093        "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
    1147         "AR = ar" \
    11481094        "ARFLAGS = r" \
    11491095        "STRIP = touch" \
    11501096        "LIBS = -L. -ltachyon $(MISCLIB) $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
     
    11531099linux-beowulf-mpi-ogl:
    11541100        $(MAKE) all \
    11551101        "ARCH = linux-beowulf-mpi" \
    1156         "CC = gcc" \
    11571102        "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DMPI $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
    1158         "AR = ar" \
    11591103        "ARFLAGS = r" \
    11601104        "STRIP = strip" \
    1161         "RANLIB = ranlib" \
    11621105        "LIBS = -L. -ltachyon -lmpi $(MISCLIB) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
    11631106
    11641107# Linux x86 using Scyld's beowulf distribution
    11651108linux-beowulf-mpi:
    11661109        $(MAKE) all \
    11671110        "ARCH = linux-beowulf-mpi" \
    1168         "CC = gcc" \
    11691111        "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DMPI $(MISCFLAGS)" \
    1170         "AR = ar" \
    11711112        "ARFLAGS = r" \
    11721113        "STRIP = strip" \
    1173         "RANLIB = ranlib" \
    11741114        "LIBS = -L. -ltachyon -lmpi $(MISCLIB) -lm"
    11751115
    11761116# Linux x86 using LAM MPI
     
    12251165linux-ipaq:
    12261166        $(MAKE) all \
    12271167        "ARCH = linux-ipaq" \
    1228         "CC = gcc" \
    12291168        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
    1230         "AR = ar" \
    12311169        "ARFLAGS = r" \
    12321170        "STRIP = strip" \
    1233         "RANLIB = ranlib" \
    12341171        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    12351172
    12361173# Linux PPC using gcc
    12371174linux-ppc:
    12381175        $(MAKE) all \
    12391176        "ARCH = linux-ppc" \
    1240         "CC = gcc" \
    12411177        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
    1242         "AR = ar" \
    12431178        "ARFLAGS = r" \
    12441179        "STRIP = strip" \
    1245         "RANLIB = ranlib" \
    12461180        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    12471181
    12481182# Linux PPC using gcc
    12491183linux-ps2:
    12501184        $(MAKE) all \
    12511185        "ARCH = linux-ps2" \
    1252         "CC = gcc" \
    12531186        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
    1254         "AR = ar" \
    12551187        "ARFLAGS = r" \
    12561188        "STRIP = strip" \
    1257         "RANLIB = ranlib" \
    12581189        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    12591190
    12601191# Linux Alpha using gcc
    12611192linux-alpha:
    12621193        $(MAKE) all \
    12631194        "ARCH = linux-alpha" \
    1264         "CC = gcc" \
    12651195        "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
    1266         "AR = ar" \
    12671196        "ARFLAGS = r" \
    12681197        "STRIP = strip" \
    1269         "RANLIB = ranlib" \
    12701198        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    12711199
    12721200# Linux Alpha using Compaq's compilers
     
    12971225linux-ia64:
    12981226        $(MAKE) all \
    12991227        "ARCH = linux-ia64" \
    1300         "CC = cc" \
    13011228        "CFLAGS = -O3 -DLinux $(MISCFLAGS) -DLP64" \
    1302         "AR = ar" \
    13031229        "ARFLAGS = r" \
    13041230        "STRIP = strip" \
    1305         "RANLIB = ranlib" \
    13061231        "LIBS = -L. -ltachyon $(MISCLIB) -lm"
    13071232
    13081233# Linux IA-64 using SGI compilers (Merced, Itanium, McKinley, etc)
     
    13211246linux-ia64-thr:
    13221247        $(MAKE) all \
    13231248        "ARCH = linux-ia64-thr" \
    1324         "CC = cc" \
    13251249        "CFLAGS = -O3 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DLP64" \
    1326         "AR = ar" \
    13271250        "ARFLAGS = r" \
    13281251        "STRIP = strip" \
    1329         "RANLIB = ranlib" \
    13301252        "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
    13311253
    13321254# Linux IA-64 using SGI compilers and threads (Merced, Itanium, McKinley, etc)
     
    13491271sgi-altix-mpi:
    13501272        $(MAKE) all \
    13511273        "ARCH = sgi-altix-mpi" \
    1352         "CC = cc" \
    13531274        "CFLAGS = -Wall -O3 -DLinux  -DMPI " \
    1354         "AR = ar" \
    13551275        "ARFLAGS = r" \
    13561276        "STRIP = strip" \
    13571277        "LIBS = -ltachyon -lmpi $(MISCLIB) -lm "