Fork me on GitHub

Changeset 910bd98 in git for doc


Ignore:
Timestamp:
Jun 28, 2021, 8:56:38 PM (3 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
master
Children:
5c257a5
Parents:
71eba5e
Message:

update genMakefile.tcl and Makefile.arch

Location:
doc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • doc/Makefile.arch

    r71eba5e r910bd98  
    3939OPT2          = -g
    4040else
    41 ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),)
    42 OPT           = -g
    43 OPT2          = -g
    44 else
    4541OPT           = -O
    4642OPT2          = -O2
    47 endif
    4843endif
    4944
    … …  
    5247ROOTLIBS     := $(shell $(RC) --libs)
    5348ROOTGLIBS    := $(shell $(RC) --glibs)
    54 HASTHREAD    := $(shell $(RC) --has-thread)
    55 ROOTCINT     := rootcint
     49ROOTCLING    := rootcling
    5650
    5751ifeq ($(PLATFORM),macosx)
    58 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
     52ROOTLIBDIR   := $(shell $(RC) --libdir)
     53MACOSX_MAJOR := $(strip $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1))
     54MACOSX_MINOR := $(strip $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2))
    5955ifeq ($(MACOSX_DEPLOYMENT_TARGET),)
    60 MACOSXTARGET := 10.$(MACOSX_MINOR)
     56MACOSXTARGET := $(MACOSX_MAJOR).$(MACOSX_MINOR)
    6157else
    6258MACOSXTARGET := $(MACOSX_DEPLOYMENT_TARGET)
    … …  
    118114SOFLAGS       = -shared
    119115DllSuf        = a
    120 EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
     116EXPLLINKLIBS  = $(ROOTGLIBS)
    121117endif
    122118
    … …  
    146142LDFLAGS       = $(OPT)
    147143SOFLAGS       = -G
    148 endif
    149 
    150 ifeq ($(ARCH),sgicc)
    151 # SGI
    152 CXX           = CC -n32  -I/usr/include/CC.sgi
    153 CXXFLAGS      = $(OPT)
    154 LD            = CC -n32 -LANG:std  -I/usr/include/CC.sgi
    155 LDFLAGS       = $(OPT)
    156 SOFLAGS       = -shared
    157 endif
    158 
    159 ifeq ($(ARCH),sgicc64)
    160 # SGI
    161 CXX           = CC -64  -I/usr/include/CC.sgi
    162 CXXFLAGS      = $(OPT)
    163 LD            = CC -64 -LANG:std -I/usr/include/CC.sgi
    164 LDFLAGS       = $(OPT)
    165 SOFLAGS       = -shared
    166 endif
    167 
    168 ifeq ($(ARCH),sgigcc)
    169 # SGI 6.x with gcc
    170 CXX           = g++
    171 CXXFLAGS      = $(OPT) -Wall -fPIC
    172 LD            = g++
    173 LDFLAGS       = $(OPT) -Wl,-u,__builtin_new -Wl,-u,__builtin_delete -Wl,-u,__nw__FUiPv
    174 SOFLAGS       = -shared
    175 endif
    176 
    177 ifeq ($(ARCH),sgin32gcc)
    178 # SGI 6.x with gcc for n32 ABI
    179 CXX           = g++
    180 CXXFLAGS      = $(OPT) -Wall -fPIC
    181 LD            = g++
    182 LDFLAGS       = $(OPT) -L/usr/lib32 -Wl,-woff,134 -lgen
    183 SOFLAGS       = -shared
    184 endif
    185 
    186 ifeq ($(ARCH),alphagcc)
    187 # Alpha/OSF with gcc
    188 CXX           = g++
    189 CXXFLAGS      = $(OPT2) -Wall -fPIC
    190 LD            = g++
    191 LDFLAGS       = $(OPT2)
    192 SOFLAGS       = -Wl,-expect_unresolved,* -shared
    193 endif
    194 
    195 ifeq ($(ARCH),alphacxx6)
    196 # Alpha/OSF with cxx6
    197 CXX           = cxx
    198 CXXFLAGS      = $(OPT)
    199 LD            = cxx
    200 LDFLAGS       = $(OPT)
    201 SOFLAGS       = -shared -nocxxstd -Wl,-expect_unresolved,*,-msym
    202144endif
    203145
    … …  
    282224endif
    283225
    284 ifeq ($(ARCH),linuxalphagcc)
    285 # Alpha Linux with gcc
    286 CXX           = g++
    287 CXXFLAGS      = $(OPT2) -Wall -fPIC
    288 LD            = g++
    289 LDFLAGS       = $(OPT2)
    290 SOFLAGS       = -shared
    291 endif
    292 
    293 ifeq ($(ARCH),linuxmips)
    294 # GNU/Linux on mips (BE/LE, O32/N32/N64) with gcc
    295 CXX           = g++
    296 CXXFLAGS      = $(OPT2) -Wall -fPIC
    297 LD            = g++
    298 LDFLAGS       = $(OPT2)
    299 SOFLAGS       = -shared
    300 endif
    301 
    302226ifeq ($(ARCH),linuxhppa)
    303227# GNU/Linux on hppa with gcc
    … …  
    318242endif
    319243
     244ifeq ($(ARCH),linuxarm64)
     245# ARMv8-A (AArch64) Linux with gcc and glibc
     246CXX           = g++
     247CXXFLAGS      = $(OPT) -Wall -fPIC
     248LD            = g++
     249LDFLAGS       = $(OPT)
     250SOFLAGS       = -shared
     251endif
     252
    320253ifeq ($(ARCH),freebsd4)
    321254# FreeBSD with glibc
    … …  
    360293LD            = g++
    361294LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)
    362 EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
    363 # The SOFLAGS will be used to create the .dylib,
    364 # the .so will be created separately
    365 ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
     295EXPLLINKLIBS  = $(ROOTGLIBS)
    366296DllSuf        = so
    367 else
    368 DllSuf        = dylib
    369 endif
    370 ifneq ($(subst $(MACOSX_MINOR),,12),12)
    371 LD            = g++
    372 endif
    373297SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    374298endif
    … …  
    376300ifeq ($(ARCH),macosxicc)
    377301# MacOS X with Intel icc compiler
    378 ifeq ($(MACOSX_MINOR),5)
    379 MACOSX_MINOR := 4
    380 endif
    381302CXX           = icc
    382303CXXFLAGS      = $(OPT) -fPIC -wd1476
    383304LD            = icpc
    384305LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)
    385 EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
    386 # The SOFLAGS will be used to create the .dylib,
    387 # the .so will be created separately
    388 ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
     306EXPLLINKLIBS  = $(ROOTGLIBS)
    389307DllSuf        = so
    390 else
    391 DllSuf        = dylib
    392 endif
    393308SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    394309endif
    … …  
    400315CXXFLAGS      = $(OPT2) -pipe -Wall -W -Woverloaded-virtual
    401316LD            = g++
    402 LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)
    403 EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
    404 # The SOFLAGS will be used to create the .dylib,
    405 # the .so will be created separately
    406 ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
     317LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) -Wl,-rpath,$(ROOTLIBDIR)
     318EXPLLINKLIBS  = $(ROOTGLIBS)
    407319DllSuf        = so
    408 else
    409 DllSuf        = dylib
    410 endif
     320SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
     321endif
     322
     323ifeq ($(ARCH),macosxarm64)
     324# Apple Silicon running macOS 11.x.
     325CXX           = g++
     326CXXFLAGS      = $(OPT2) -pipe -Wall -W -Woverloaded-virtual
     327LD            = g++
     328LDFLAGS       = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET)  -Wl,-rpath,$(ROOTLIBDIR)
     329EXPLLINKLIBS  = $(ROOTGLIBS)
     330DllSuf        = so
    411331SOFLAGS       = -dynamiclib -single_module -install_name $(CURDIR)/
    412332endif
    … …  
    426346LDOPT         = -debug
    427347else
    428 ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),)
    429 CXXOPT        = -Z7
    430 LDOPT         = -debug
    431 else
    432348CXXOPT        = -O2
    433349LDOPT         = -opt:ref
    434 endif
    435350endif
    436351ROOTINCDIR   := -I$(shell cygpath -m `$(RC) --incdir`)
    … …  
    440355SOFLAGS       = -DLL
    441356
    442 EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
     357EXPLLINKLIBS  = $(ROOTGLIBS)
    443358ifneq (,$(findstring $(VC_MAJOR),14 15))
    444359MT_EXE        = mt -nologo -manifest $@.manifest -outputresource:$@\;1; rm -f $@.manifest
    … …  
    462377SOFLAGS       = -shared -Wl,--enable-auto-image-base \
    463378                -Wl,--export-all-symbols
    464 EXPLLINKLIBS  = $(ROOTLIBS) $(ROOTGLIBS)
     379EXPLLINKLIBS  = $(ROOTGLIBS)
    465380endif
    466381
    … …  
    471386CXXFLAGS     += $(ROOTCFLAGS)
    472387LDFLAGS      += $(ROOTLDFLAGS)
    473 LIBS          = $(ROOTLIBS) $(SYSLIBS)
    474 GLIBS         = $(ROOTGLIBS) $(SYSLIBS)
     388LIBS          = $(ROOTLIBS)
     389GLIBS         = $(ROOTGLIBS)
    475390
    476391ifneq ($(ALTCC),)

  • doc/genMakefile.tcl

    r71eba5e r910bd98  
    346346        @mkdir -p $(@D)
    347347        @echo ">> Building $@"
    348 ifeq ($(ARCH),aix5)
    349         @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
    350 else
    351348ifeq ($(PLATFORM),macosx)
    352 # We need to make both the .dylib and the .so
    353349        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    354 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
    355 ifeq ($(MACOSX_MINOR),4)
    356         @ln -sf $@ $(subst .$(DllSuf),.so,$@)
    357 endif
    358 endif
    359350else
    360351ifeq ($(PLATFORM),win32)
    … …  
    365356else
    366357        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    367         @$(MT_DLL)
    368 endif
    369358endif
    370359endif
    … …  
    373362        @mkdir -p $(@D)
    374363        @echo ">> Building $@"
    375 ifeq ($(ARCH),aix5)
    376         @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
    377 else
    378364ifeq ($(PLATFORM),macosx)
    379 # We need to make both the .dylib and the .so
    380365        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    381 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
    382 ifeq ($(MACOSX_MINOR),4)
    383         @ln -sf $@ $(subst .$(DllSuf),.so,$@)
    384 endif
    385 endif
    386366else
    387367ifeq ($(PLATFORM),win32)
    … …  
    392372else
    393373        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
    394         @$(MT_DLL)
    395 endif
    396374endif
    397375endif
    … …  
    400378        @mkdir -p $(@D)
    401379        @echo ">> Building $@"
    402 ifeq ($(ARCH),aix5)
    403         @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^
    404 else
    405380ifeq ($(PLATFORM),macosx)
    406 # We need to make both the .dylib and the .so
    407381        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
    408 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
    409 ifeq ($(MACOSX_MINOR),4)
    410         @ln -sf $@ $(subst .$(DllSuf),.so,$@)
    411 endif
    412 endif
    413382else
    414383ifeq ($(PLATFORM),win32)
    … …  
    419388else
    420389        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
    421         @$(MT_DLL)
    422 endif
    423390endif
    424391endif
Note: See TracChangeset for help on using the changeset viewer.