Skip to content

Commit 54794f2

Browse files
committed
Don't export CLING_STANDARD_PCH=none in setup scripts
This variable is set in the ROOT Python setup itself (see d407003), and hence we don't need to do it in the setup scripts.
1 parent 28582e0 commit 54794f2

File tree

5 files changed

+0
-11
lines changed

5 files changed

+0
-11
lines changed

Diff for: config/thisroot.bat

-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ set CMAKE_PREFIX_PATH=%ROOTSYS%;%CMAKE_PREFIX_PATH%
1414
set PYTHONPATH=%ROOTSYS%\bin;%PYTHONPATH%
1515
set OLDPATH=
1616
set THIS=
17-
set CLING_STANDARD_PCH="none"

Diff for: config/thisroot.csh

-3
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ else
232232
setenv JUPYTER_CONFIG_DIR ${ROOTSYS}/etc/notebook
233233
endif
234234

235-
# Prevent Cppyy from checking the PCH (and avoid warning)
236-
setenv CLING_STANDARD_PCH none
237-
238235
endif # if ("$thisroot" != "")
239236

240237
set thisroot=

Diff for: config/thisroot.fish

-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ update_path CMAKE_PREFIX_PATH "$old_rootsys" "" $ROOTSYS
5050
update_path JUPYTER_PATH "$old_rootsys" "/etc/notebook" $ROOTSYS/etc/notebook
5151
update_path JUPYTER_CONFIG_DIR "$old_rootsys" "/etc/notebook" $ROOTSYS/etc/notebook
5252

53-
# Prevent Cppyy from checking the PCH (and avoid warning)
54-
set -xg CLING_STANDARD_PCH none
55-
5653
functions -e update_path
5754
set -e old_rootsys
5855
set -e thisroot

Diff for: config/thisroot.ps1

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ $ROOTSYS = split-path -parent (get-item $scriptPath)
77
$env:PATH = $ROOTSYS + '\bin;' + $env:PATH
88
$env:CMAKE_PREFIX_PATH = $ROOTSYS + ';' + $env:CMAKE_PREFIX_PATH
99
$env:PYTHONPATH = $ROOTSYS + '\bin;' + $env:PYTHONPATH
10-
$env:CLING_STANDARD_PCH = "none"

Diff for: config/thisroot.sh

-3
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,6 @@ clean_environment
252252
set_environment
253253

254254

255-
# Prevent Cppyy from checking the PCH (and avoid warning)
256-
export CLING_STANDARD_PCH=none
257-
258255
if (root-config --arch | grep -v win32gcc | grep -q -i win32); then
259256
ROOTSYS="$(cygpath -w "$ROOTSYS")"
260257
fi

0 commit comments

Comments
 (0)